From: Matthew Fioravante Subject: [PATCH 2/7] vtpm Mini-Os domain: vtpm hotplug stability fixes Date: Wed, 25 Aug 2010 11:10:26 -0400 Message-ID: <4C753262.5070107@jhuapl.edu> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1092776264==" 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. --===============1092776264== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms050201040107010107080205" This is a cryptographically signed message in MIME format. --------------ms050201040107010107080205 Content-Type: multipart/mixed; boundary="------------090206090205020100060501" This is a multi-part message in MIME format. --------------090206090205020100060501 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable Signed-off-by: Matthew Fioravante The following patch provides stability fixes for the vtpm hotplug system.= There were several cases where the hotplug system would get in a bad=20 state and would hang because of a stale lockfile that never got cleaned=20 up. The pipes that talk to the manager could also get left in a bad state= =2E The hotplug scripts as they are now only work correctly if one file lock = is set. If 2 or more file locks are created and the script exits on an=20 error, the trap cleanup will only release the last lock. This patch also adds a binary called vtpmmgrtalk which talks to the=20 manager using the console fifos. It uses non-blocking IO to open the=20 fifos so it can quit immediatly with an error if the manager is not=20 listening on the other side. The hotplug scripts now use this program to = talk to the manager. --------------090206090205020100060501 Content-Type: text/x-patch; name="2-hotplug.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="2-hotplug.patch" diff -r 7c44921abfde -r 5793f5c2d67d tools/vtpm_manager/vtpmmgrtalk/Makef= ile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/vtpm_manager/vtpmmgrtalk/Makefile Tue Jul 20 15:26:31 2010 -0= 400 @@ -0,0 +1,17 @@ +XEN_ROOT =3D ../../.. +TOOLS_INSTALL_DIR =3D $(DESTDIR)/usr/bin + +BIN=3Dvtpmmgrtalk +OBJS=3Dvtpmmgrtalk.o +CFLAGS=3D-Wall -O2 + +all: ${BIN} + +${BIN}: ${OBJS} + gcc -o $@ $< + +install: all + install -m 0755 ${BIN} ${TOOLS_INSTALL_DIR} + +clean:=20 + -rm ${BIN} ${OBJS} diff -r 7c44921abfde -r 5793f5c2d67d tools/vtpm_manager/vtpmmgrtalk/vtpmm= grtalk.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/vtpm_manager/vtpmmgrtalk/vtpmmgrtalk.c Tue Jul 20 15:26:31 20= 10 -0400 @@ -0,0 +1,94 @@ +#include +#include +#include +#include +#include +#include +#include + +#include "../manager/vtpm_manager.h" + +int main(int argc, char** argv) { + int wfd, rfd; + uint8_t buf[COMMAND_BUFFER_SIZE]; + ssize_t size; + int i, c; + int rc =3D 0; + + const char* wfile =3D VTPM_RX_HP_FNAME; + const char* rfile =3D VTPM_TX_HP_FNAME; + + /* Open for writing in non-blocking mode and exit if + * the manager is not waiting on the other side */ + if((wfd =3D open(wfile, O_WRONLY | O_NONBLOCK)) < 0) { + fprintf(stderr, "Error opening %s for writing : %s\n", wfile,strer= ror(errno)); + return 1; + } + /* Set the pipe back to blocking mode */ + fcntl(wfd, F_SETFL, 0); + + /* Open the read pipe */ + if((rfd =3D open(rfile, O_RDONLY)) < 0) { + close(wfd); + fprintf(stderr, "Error opening %s for reading : %s\n", rfile,strer= ror(errno)); + return 1; + } + =20 + /*Grab the ASCII hex input from stdin and convert to binary */ + for(i =3D 0; i < COMMAND_BUFFER_SIZE; ++i) { + c =3D scanf("%02hhX", buf + i); + if(c =3D=3D EOF) { + break; + } else if ( c !=3D 1) { + fprintf(stderr, "Malformed Input! Use ASCII hex!\n"); + rc =3D 1; + goto quit; + } + } + size =3D i; + + /* Send request to the manager only if a request was actually given *= / + if(size > 0) { + /* Lock the pipes for reading/writing */ + if(flock(wfd, LOCK_EX)) { + fprintf(stderr, "Unable to lock %s : %s\n", wfile, strerror(errno)); + rc =3D 1; + goto quit; + } + if(flock(rfd, LOCK_EX)) { + fprintf(stderr, "Unable to lock %s : %s\n", wfile, strerror(errno)); + rc =3D 1; + goto quit; + } + + /* Write the binary data to the pipe */ + if(write(wfd, buf, size) !=3D size) { + fprintf(stderr, "Error writing to %s : %s\n", wfile, strerror(errno));= + rc =3D 1; + goto quit; + } + + /* Read the response from the manager */ + size =3D read(rfd, buf, COMMAND_BUFFER_SIZE); + if(size < 0) {=20 + fprintf(stderr, "Error reading %s : %s\n", rfile, strerror(errno)); + rc =3D 1; + goto quit; + } + /* Output the hex */ + for(i =3D 0; i < size; ++i) { + printf("%02X", buf[i]); + } + fprintf(stderr,"\n"); + + /* Unlock the pipes */ + flock(rfd, LOCK_UN); + flock(wfd, LOCK_UN); + } + + rc =3D 0; +quit: + close(rfd); + close(wfd); + return rc; +} diff -r 7c44921abfde -r 5793f5c2d67d tools/vtpm_manager/Makefile --- a/tools/vtpm_manager/Makefile Thu Jul 01 14:17:13 2010 -0400 +++ b/tools/vtpm_manager/Makefile Tue Jul 20 15:26:31 2010 -0400 @@ -3,7 +3,7 @@ # Base definitions and rules include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk =20 -SUBDIRS =3D crypto tcs util manager migration +SUBDIRS =3D crypto tcs util manager migration vtpmmgrtalk OPENSSL_HEADER =3D /usr/include/openssl/crypto.h =20 .PHONY: all clean install diff -r 5793f5c2d67d -r c54dd4a9e114 tools/hotplug/Linux/vtpm --- a/tools/hotplug/Linux/vtpm Tue Jul 20 15:26:31 2010 -0400 +++ b/tools/hotplug/Linux/vtpm Tue Jul 20 15:28:22 2010 -0400 @@ -1,22 +1,18 @@ #!/bin/bash =20 +export PATH=3D$PATH:/usr/sbin:/sbin + dir=3D$(dirname "$0") . "$dir/vtpm-hotplug-common.sh" =20 -vtpm_fatal_error=3D0 - case "$command" in add) vtpm_create_instance + success ;; remove) vtpm_remove_instance + success ;; esac =20 -if [ $vtpm_fatal_error -eq 0 ]; then - log debug "Successful vTPM operation '$command'." - success -else - fatal "Error while executing vTPM operation '$command'." -fi diff -r 5793f5c2d67d -r c54dd4a9e114 tools/hotplug/Linux/vtpm-common.sh --- a/tools/hotplug/Linux/vtpm-common.sh Tue Jul 20 15:26:31 2010 -0400 +++ b/tools/hotplug/Linux/vtpm-common.sh Tue Jul 20 15:28:22 2010 -0400 @@ -98,7 +98,7 @@ avail=3D0 else instances=3D$(cat $VTPMDB | \ - awk \ + gawk \ '{ \ if (1 !=3D index($1,"#")) { \ printf("%s ",$2); \ @@ -120,7 +120,7 @@ function vtpmdb_get_free_instancenum () { local ctr instances don found instances=3D$(cat $VTPMDB | \ - awk \ + gawk \ '{ \ if (1 !=3D index($1,"#")) { \ printf("%s ",$2); \ @@ -174,7 +174,7 @@ inst=3D$2 =20 res=3D$(cat $VTPMDB | \ - awk -vvmname=3D$vmname \ + gawk -vvmname=3D$vmname \ -vinst=3D$inst \ '{ \ if ( 1 =3D=3D index($1,"#")) {\ @@ -209,7 +209,7 @@ VTPMDB_TMP=3D"$VTPMDB".tmp =20 $(cat $VTPMDB | \ - awk -vvmname=3D$vmname \ + gawk -vvmname=3D$vmname \ '{ \ if ( $1 !=3D vmname ) { \ print $0; \ @@ -276,12 +276,10 @@ =20 vtpm_create $instance =20 - if [ $vtpm_fatal_error -eq 0 ]; then - if [ "$uuid" !=3D "" ]; then - vtpmdb_add_instance $uuid $instance - else - vtpmdb_add_instance $domname $instance - fi + if [ "$uuid" !=3D "" ]; then + vtpmdb_add_instance $uuid $instance + else + vtpmdb_add_instance $domname $instance fi else if [ "$reason" =3D=3D "resume" ]; then @@ -290,7 +288,6 @@ vtpm_start $instance fi fi - release_lock vtpmdb =20 xenstore_write $XENBUS_PATH/instance $instance @@ -322,8 +319,8 @@ if [ "$instance" !=3D "0" ]; then vtpm_suspend $instance fi + release_lock vtpmdb =20 - release_lock vtpmdb } =20 =20 @@ -350,13 +347,13 @@ function vtpm_isLocalAddress() { local addr res addr=3D$(ping $1 -c 1 | \ - awk '{ print substr($3,2,length($3)-2); exit }') + gawk '{ print substr($3,2,length($3)-2); exit }') if [ "$addr" =3D=3D "" ]; then echo "-1" return fi res=3D$(ifconfig | grep "inet addr" | \ - awk -vaddr=3D$addr \ + gawk -vaddr=3D$addr \ '{ \ if ( addr =3D=3D substr($2, 6)) {\ print "1"; \ diff -r 5793f5c2d67d -r c54dd4a9e114 tools/hotplug/Linux/vtpm-delete --- a/tools/hotplug/Linux/vtpm-delete Tue Jul 20 15:26:31 2010 -0400 +++ b/tools/hotplug/Linux/vtpm-delete Tue Jul 20 15:28:22 2010 -0400 @@ -5,6 +5,8 @@ # or # vtpm-delete --vmname =20 +export PATH=3D$PATH:/usr/sbin:/sbin + dir=3D$(dirname "$0") . "$dir/vtpm-common.sh" =20 diff -r 5793f5c2d67d -r c54dd4a9e114 tools/hotplug/Linux/vtpm-impl --- a/tools/hotplug/Linux/vtpm-impl Tue Jul 20 15:26:31 2010 -0400 +++ b/tools/hotplug/Linux/vtpm-impl Tue Jul 20 15:28:22 2010 -0400 @@ -32,14 +32,16 @@ # OF THE POSSIBILITY OF SUCH DAMAGE. # =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 =20 -# | SRC | TAG | CMD SIZE | = ORD |mtype|strt -TPM_CMD_OPEN=3D\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x11\\x01\\= x00\\x00\\x01\\x01\\x01 -TPM_CMD_RESM=3D\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x11\\x01\\= x00\\x00\\x01\\x01\\x02 -TPM_CMD_CLOS=3D\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x0e\\x01\\= x00\\x00\\x02 -TPM_CMD_DELE=3D\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x0e\\x01\\= x00\\x00\\x03 +export PATH=3D$PATH:/usr/sbin:/sbin =20 -TPM_TYPE_PVM=3D\\x01 -TPM_TYPE_HVM=3D\\x02 +# | SRC |TAG| CMD SZ|| ORD |mtype|strt +TPM_CMD_OPEN=3D"0000000001C100000011010000010101" +TPM_CMD_RESM=3D"0000000001C100000011010000010102" +TPM_CMD_CLOS=3D"0000000001C10000000E01000002" +TPM_CMD_DELE=3D"0000000001C10000000E01000003" + +TPM_TYPE_PVM=3D01 +TPM_TYPE_HVM=3D02 =20 TPM_SUCCESS=3D00000000 =20 @@ -70,24 +72,19 @@ local inst=3D$2; local inst_bin=3D$(hex32_to_bin $inst); =20 - claim_lock vtpm_mgr + local resp_hex + #send cmd to vtpm_manager and get response + if ! resp_hex=3D`echo "$cmd$(str_to_hex32 $inst)" | vtpmmgrtalk `; then= + release_lock vtpmdb + fatal "Error communicating with vTPM Manager" + fi =20 - #send cmd to vtpm_manager - printf "$cmd$inst_bin" > $TX_VTPM_MANAGER - - #recv response - set +e - local resp_hex=3D`dd skip=3D10 bs=3D1 count=3D4 if=3D$RX_VTPM_MANAGER 2= > /dev/null | xxd -ps` - set -e - - release_lock vtpm_mgr + resp_hex=3D`echo $resp_hex | cut -b 21-` =20 #return whether the command was successful - if [ $resp_hex -ne $TPM_SUCCESS ]; then - vtpm_fatal_error=3D1 - false - else - true + if [ "$resp_hex" !=3D "$TPM_SUCCESS" ]; then + release_lock vtpmdb + fatal "vTPM Manager returned failure code $resp_hex" fi } =20 @@ -142,13 +139,8 @@ =20 function vtpm_delete() { local inst=3D$1 - if $(vtpm_manager_cmd $TPM_CMD_DELE $inst); then - rm -f /var/vtpm/vtpm_dm_$1.data - true - else=20 - vtpm_fatal_error=3D1 - false - fi + $(vtpm_manager_cmd $TPM_CMD_DELE $inst) + rm -f /var/vtpm/vtpm_dm_$1.data } =20 # Perform a migration step. This function differentiates between migrati= on --------------090206090205020100060501-- --------------ms050201040107010107080205 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 DQEHATAcBgkqhkiG9w0BCQUxDxcNMTAwODI1MTUxMDI2WjAjBgkqhkiG9w0BCQQxFgQUIz50 rRUyPGhJNsw9YxTjPuIy4A8wRgYJKwYBBAGCNxAEMTkwNzAvMQswCQYDVQQGEwJVUzEPMA0G A1UEChMGSkhVQVBMMQ8wDQYDVQQLEwZCSVNEQ0ECBD/xkcEwSAYLKoZIhvcNAQkQAgsxOaA3 MC8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJU0RDQQIEP/GR wTBfBgkqhkiG9w0BCQ8xUjBQMAsGCWCGSAFlAwQBAjAKBggqhkiG9w0DBzAOBggqhkiG9w0D AgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYIKoZIhvcNAwICASgwDQYJKoZIhvcN AQEBBQAEgYBzi/B/joF8Ws0B4tda8HeKIRYO+2edZgbbtCnH5qWHN0eezrjwn8kpDT6q31s+ 7eAkNoEaI3qysna1RPYJE41n9vWfYrngi0b4eBUrchOtex0jfk2F5DwJ9lexVgq3sYyTv5bM nvNLqeRWClLHHaZ3Mcw3i7X9eZ2+rgyXpu64FQAAAAAAAA== --------------ms050201040107010107080205-- --===============1092776264== 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 --===============1092776264==--