From: Matthew Fioravante Subject: [PATCH 1/12] VTPM mini-os: mmio= option for domain config files to pass iomem regions Date: Fri, 11 Mar 2011 17:31:50 -0500 Message-ID: <4D7AA2D6.8030608@jhuapl.edu> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1761357476==" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: "xen-devel@lists.xensource.com" List-Id: xen-devel@lists.xenproject.org This is a cryptographically signed message in MIME format. --===============1761357476== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms060405060405000807090401" This is a cryptographically signed message in MIME format. --------------ms060405060405000807090401 Content-Type: multipart/mixed; boundary="------------050007000400090702030800" This is a multi-part message in MIME format. --------------050007000400090702030800 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable Currently IO ports and irqs can be passed through to domU's using the=20 domain config file. This patch adds support for passing through iomem regions when booting=20 domains using xm. It works almost exactly the same as the ioports option.= The format for the option is mmio =3D ['pagenum,npages'] Where the first is the page number (in a hex string) and the second is=20 the number of pages. An example for passing through the tpm is: mmio =3D ['fed40',5] Signed off by: Matthew Fioravante --------------050007000400090702030800 Content-Type: text/x-patch; name="1-xm-mmio.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="1-xm-mmio.patch" diff -Naur xen-unstable-trp-sdp-pristine/tools/python/xen/xend/server/mmi= oif.py xen-unstable-trp-sdp/tools/python/xen/xend/server/mmioif.py --- xen-unstable-trp-sdp-pristine/tools/python/xen/xend/server/mmioif.py = 1969-12-31 19:00:00.000000000 -0500 +++ xen-unstable-trp-sdp/tools/python/xen/xend/server/mmioif.py 2011-02-2= 3 19:40:48.000000000 -0500 @@ -0,0 +1,102 @@ +#=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D +# 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 Pub= lic +# 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 +#=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D +# Copyright (C) 2004, 2005 Mike Wray +# Copyright (C) 2005 XenSource Ltd +# Copyright (C) 2005 Jody Belka +#=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D + + +import types + +import xen.lowlevel.xc + +from xen.xend.XendError import VmError + +from xen.xend.server.DevController import DevController + + +xc =3D xen.lowlevel.xc.xc() + + +def parse_mmioaddr(val): + """Parse an mmio address + """ + if isinstance(val, types.StringType): + radix =3D 10 + if val.startswith('0x') or val.startswith('0X'): + radix =3D 16 + v =3D int(val, radix) + else: + v =3D val + return v + + +class MMIOController(DevController): + + valid_cfg =3D ['mfn', 'nmfns', 'uuid'] + + def __init__(self, vm): + DevController.__init__(self, vm) + + def getDeviceConfiguration(self, devid, transaction =3D None): + result =3D DevController.getDeviceConfiguration(self, devid, tra= nsaction) + if transaction is None: + devinfo =3D self.readBackend(devid, *self.valid_cfg) + else: + devinfo =3D self.readBackendTxn(transaction, devid, *self.va= lid_cfg) + config =3D dict(zip(self.valid_cfg, devinfo)) + config =3D dict([(key, val) for key, val in config.items() + if val !=3D None]) + return config + + def getDeviceDetails(self, config): + """@see DevController.getDeviceDetails""" + + def get_param(field): + try: + val =3D config.get(field) + + if not val: + raise VmError('mmio: Missing %s config setting' % fi= eld) + + return parse_mmioaddr(val) + except: + raise VmError('mmio: Invalid config setting %s: %s' % + (field, val)) + =20 + mfn =3D get_param('mfn') + nmfns =3D get_param('nmfns')=20 + + if nmfns <=3D 0: + raise VmError('mmio: invalid number of mfns: %s' % str(nmfns)) + #FIXME: Bounds check for max mmio range?? + + rc =3D xc.domain_iomem_permission(domid =3D self.getDomid= (), + first_pfn =3D mfn, + nr_pfns =3D nmfns, + allow_access =3D True) + + if rc < 0: + #todo non-fatal + raise VmError( + 'mmio: Failed to configure memory mapped i/o range: %s,%= s' % + (str(mfn), str(nmfns))) + + back =3D dict([(k, config[k]) for k in self.valid_cfg if k in co= nfig]) + return (self.allocateDeviceID(), back, {}) + + def waitForDevice(self, devid): + # don't wait for hotplug + return diff -Naur xen-unstable-trp-sdp-pristine/tools/python/xen/xend/XendDevice= s.py xen-unstable-trp-sdp/tools/python/xen/xend/XendDevices.py --- xen-unstable-trp-sdp-pristine/tools/python/xen/xend/XendDevices.py 20= 11-02-23 14:47:26.000000000 -0500 +++ xen-unstable-trp-sdp/tools/python/xen/xend/XendDevices.py 2011-02-23 = 19:40:48.000000000 -0500 @@ -19,7 +19,7 @@ # A collection of DevControllers=20 # =20 -from xen.xend.server import blkif, netif, tpmif, pciif, iopif, irqif, vf= bif, vscsiif, netif2, vusbif +from xen.xend.server import blkif, netif, tpmif, pciif, iopif, irqif, mm= ioif, vfbif, vscsiif, netif2, vusbif from xen.xend.server.BlktapController import BlktapController, Blktap2Co= ntroller from xen.xend.server.ConsoleController import ConsoleController =20 @@ -42,6 +42,7 @@ 'pci': pciif.PciController, 'ioports': iopif.IOPortsController, 'irq': irqif.IRQController, + 'mmio': mmioif.MMIOController, 'tap': BlktapController, 'tap2': Blktap2Controller, 'vfb': vfbif.VfbifController, diff -Naur xen-unstable-trp-sdp-pristine/tools/python/xen/xm/create.py xe= n-unstable-trp-sdp/tools/python/xen/xm/create.py --- xen-unstable-trp-sdp-pristine/tools/python/xen/xm/create.py 2011-02-2= 3 14:47:26.000000000 -0500 +++ xen-unstable-trp-sdp/tools/python/xen/xm/create.py 2011-02-23 19:40:4= 8.000000000 -0500 @@ -378,6 +378,13 @@ For example 'irq=3D7'. This option may be repeated to add more than one IRQ.""") =20 +gopts.var('mmio', val=3D'MFN,NMFNS', + fn=3Dappend_value, default=3D[], + use=3D"""Allow access to memory mapped IO pages, using the giv= en params. + For example 'mmio=3De4df0,5', to allow access to 5 pages starting=20 + at page number 0xe4df0. The first arg is in hex, the second in decimal= =2E + This option may be repeated to add more than one memory range""") + gopts.var('vfb', val=3D"vnc=3D1,sdl=3D1,vncunused=3D1,vncdisplay=3DN,vnc= listen=3DADDR,display=3DDISPLAY,xauthority=3DXAUTHORITY,vncpasswd=3DPASSW= ORD,opengl=3D1,keymap=3DFILE,serial=3DFILE,monitor=3DFILE", fn=3Dappend_value, default=3D[], use=3D"""Make the domain a framebuffer backend. @@ -942,6 +949,13 @@ config_irq =3D ['irq', ['irq', irq]] config_devs.append(['device', config_irq]) =20 +def configure_mmio(config_devs, vals): + """Create the config for mmio. + """ + for (mfn, nmfns) in vals.mmio: + config_mmio =3D ['mmio', ['mfn', mfn], ['nmfns', nmfns]] + config_devs.append(['device', config_mmio]) + def configure_vfbs(config_devs, vals): for f in vals.vfb: d =3D comma_sep_kv_to_dict(f) @@ -1186,6 +1200,7 @@ configure_vscsis(config_devs, vals) configure_vusbs(config_devs, vals) configure_ioports(config_devs, vals) + configure_mmio(config_devs, vals) configure_irq(config_devs, vals) configure_vifs(config_devs, vals) configure_vtpm(config_devs, vals) @@ -1302,6 +1317,18 @@ irq.append(d) vals.irq =3D irq =20 +def preprocess_mmio(vals): + if not vals.mmio: return + mmio =3D [] + for v in vals.mmio: + d =3D v.split(',') + if len(d) < 1 or len(d) > 2: + err('Invalid mmio range specifier: ' + v) + #Add hex specifier to the page number + d[0] =3D '0x' + d[0] + mmio.append(d) + vals.mmio =3D mmio + def preprocess_vtpm(vals): if not vals.vtpm: return vtpms =3D [] @@ -1393,6 +1420,7 @@ preprocess_pci(vals) preprocess_vscsi(vals) preprocess_ioports(vals) + preprocess_mmio(vals) preprocess_ip(vals) preprocess_irq(vals) preprocess_nfs(vals) --------------050007000400090702030800-- --------------ms060405060405000807090401 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIHZzCC A5kwggMCoAMCAQICBD/xkcEwDQYJKoZIhvcNAQEFBQAwLzELMAkGA1UEBhMCVVMxDzANBgNV BAoTBkpIVUFQTDEPMA0GA1UECxMGQklTRENBMB4XDTA5MDcxNzE1MDgwOVoXDTEyMDcxNzE1 MzgwOVowZjELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkpIVUFQTDEPMA0GA1UECxMGUGVvcGxl MTUwFgYDVQQLEw9WUE5Hcm91cC1CSVNEQ0EwGwYDVQQDExRNYXR0aGV3IEUgRmlvcmF2YW50 ZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyzeGk9zPA33fsB3uvk/Izs9GGHCpHI8b zXdBIVg6++S+jK53PoaWgmtSLr/c732ea1zPR6ACymwAWON+U5rB+VJAUZ4l/p0T3LZjE1Kq nbQJ+pgb+WAmBtdrxrtky61E9HD8dO70x37+ejhunpF9OuSU5MnOPmMx6ranvahUsOsCAwEA AaOCAYkwggGFMAsGA1UdDwQEAwIFIDAbBg0rBgEEAbMlCwMBAQEBBAoWCGZpb3JhbWUxMBsG DSsGAQQBsyULAwEBAQIEChIIMDAxMDQyNjEwWAYJYIZIAYb6ax4BBEsMSVRoZSBwcml2YXRl IGtleSBjb3JyZXNwb25kaW5nIHRvIHRoaXMgY2VydGlmaWNhdGUgbWF5IGhhdmUgYmVlbiBl eHBvcnRlZC4wKAYDVR0RBCEwH4EdTWF0dGhldy5GaW9yYXZhbnRlQGpodWFwbC5lZHUwUgYD VR0fBEswSTBHoEWgQ6RBMD8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNV BAsTBkJJU0RDQTEOMAwGA1UEAxMFQ1JMNDkwHwYDVR0jBBgwFoAUCDUpmxH52EU2CyWmF2EJ MB1yqeswHQYDVR0OBBYEFO3ziReJlElP3ilaLQ5gwsg0RlgoMAkGA1UdEwQCMAAwGQYJKoZI hvZ9B0EABAwwChsEVjcuMQMCBLAwDQYJKoZIhvcNAQEFBQADgYEAMOY3Zf6gx3gv/fDd11cz h2Daj+8NExx/2Le3c88gfDVhPVgVX5S52EjeFbK5yVP0Xlm82vRADO47dTA2PKbpp50rJcAZ rl5bg5tQ/WbLAaRITCtOJWVVKXD9V7X2o3Z/IM2op3hb4mmDXSDS+Hzn0Jd2mAXl4iHPfI0p XlXqA9QwggPGMIIDL6ADAgECAgQ/8cn9MA0GCSqGSIb3DQEBBQUAMC8xCzAJBgNVBAYTAlVT MQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJU0RDQTAeFw0xMDA2MTExODIyMDZaFw0x MzA2MTExODUyMDZaMGYxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsT BlBlb3BsZTE1MBYGA1UECxMPVlBOR3JvdXAtQklTRENBMBsGA1UEAxMUTWF0dGhldyBFIEZp b3JhdmFudGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJ6W8FUj+qNTW+ZXFu3Xd8k6 PYgSXYu6s+JwDTjBTyuyTsuZ6SjdYoqLrJdvFP7HFCREueYD8AFmCSt7lckALAOGnYAyouQ6 A9VBw0BMKW2O4hyyXqtDT6+AamDapwhT2xOhwvM0ia6+Kip/oFVEE9/UiBanYiDycGS/BWE0 UP87AgMBAAGjggG2MIIBsjALBgNVHQ8EBAMCB4AwKwYDVR0QBCQwIoAPMjAxMDA2MTExODIy MDZagQ8yMDEyMDcxNzIyNTIwNlowGwYNKwYBBAGzJQsDAQEBAQQKFghmaW9yYW1lMTAbBg0r BgEEAbMlCwMBAQECBAoSCDAwMTA0MjYxMFgGCWCGSAGG+mseAQRLDElUaGUgcHJpdmF0ZSBr ZXkgY29ycmVzcG9uZGluZyB0byB0aGlzIGNlcnRpZmljYXRlIG1heSBoYXZlIGJlZW4gZXhw b3J0ZWQuMCgGA1UdEQQhMB+BHU1hdHRoZXcuRmlvcmF2YW50ZUBqaHVhcGwuZWR1MFIGA1Ud HwRLMEkwR6BFoEOkQTA/MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGSkhVQVBMMQ8wDQYDVQQL EwZCSVNEQ0ExDjAMBgNVBAMTBUNSTDU2MB8GA1UdIwQYMBaAFAg1KZsR+dhFNgslphdhCTAd cqnrMB0GA1UdDgQWBBTui2MYOq/cB2fs3ULQR59XWf2EzTAJBgNVHRMEAjAAMBkGCSqGSIb2 fQdBAAQMMAobBFY3LjEDAgSwMA0GCSqGSIb3DQEBBQUAA4GBACTvR0IeGDQoVS87maiuQESQ EQ/CaLoxmX3aO+arr4No1xUHtrBI7y58SWYJv6b/H3WWpKuPAlsI2ByrryKe7A40xLEH6Psu 0qTfzdjbyVlOUqnytVYGLTS0UaBiVAeUNWmfg4PeYN5Kqcn6VDCEiS/CClS7SVXzeH4IBVVG GfcMMYICMTCCAi0CAQEwNzAvMQswCQYDVQQGEwJVUzEPMA0GA1UEChMGSkhVQVBMMQ8wDQYD VQQLEwZCSVNEQ0ECBD/xyf0wCQYFKw4DAhoFAKCCAVAwGAYJKoZIhvcNAQkDMQsGCSqGSIb3 DQEHATAcBgkqhkiG9w0BCQUxDxcNMTEwMzExMjIzMTUwWjAjBgkqhkiG9w0BCQQxFgQU1lR7 3dHKuNObmYTYahrBqVV9wZwwRgYJKwYBBAGCNxAEMTkwNzAvMQswCQYDVQQGEwJVUzEPMA0G A1UEChMGSkhVQVBMMQ8wDQYDVQQLEwZCSVNEQ0ECBD/xkcEwSAYLKoZIhvcNAQkQAgsxOaA3 MC8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJU0RDQQIEP/GR wTBfBgkqhkiG9w0BCQ8xUjBQMAsGCWCGSAFlAwQBAjAKBggqhkiG9w0DBzAOBggqhkiG9w0D AgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYIKoZIhvcNAwICASgwDQYJKoZIhvcN AQEBBQAEgYCE8SAElmtB0O6qU1EDMPHwRfWOPKWI/UadYRajiHGALGL5e/Plp+OvgINybPOD PntVCcZKDYJJK+ABzky1CRrMGtemPDIydN71SgOUvZXHvzuuD0rIyGhA89Dg2k+Q/V64i+hv 70w2pHG30CcYsDqG8VSxxoWLkIfz3JDcIIDTJAAAAAAAAA== --------------ms060405060405000807090401-- --===============1761357476== 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.xensource.com http://lists.xensource.com/xen-devel --===============1761357476==--