From: Matthew Fioravante Subject: [PATCH 2/12] VTPM mini-os: posix IO layer for blkfront in mini-os Date: Fri, 11 Mar 2011 17:34:26 -0500 Message-ID: <4D7AA372.4040506@jhuapl.edu> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0463412525==" 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. --===============0463412525== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms010704070109050704060801" This is a cryptographically signed message in MIME format. --------------ms010704070109050704060801 Content-Type: multipart/mixed; boundary="------------070403030502030104040906" This is a multi-part message in MIME format. --------------070403030502030104040906 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable The following patch adds POSIX IO for the blkfront device driver. If mini-os is built with #define HAVE_LIBC then one can use=20 blkfront_open() to obtain a file descriptor to a block device. read(),=20 write(), lseek() and fstat() can be used on the file descriptor to read=20 and write to the block device in a syncronous manner. Signed off by: Matthew Fioravante --------------070403030502030104040906 Content-Type: text/x-patch; name="2-blkfront.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="2-blkfront.patch" diff -Naur xen-unstable.hg-pristine/extras/mini-os/blkfront.c xen-unstabl= e.hg/extras/mini-os/blkfront.c --- xen-unstable.hg-pristine/extras/mini-os/blkfront.c 2011-02-25 13:28:1= 3.000000000 -0500 +++ xen-unstable.hg/extras/mini-os/blkfront.c 2011-02-25 13:21:29.0000000= 00 -0500 @@ -546,9 +546,121 @@ #ifdef HAVE_LIBC int blkfront_open(struct blkfront_dev *dev) { + /* Silently prevent multiple opens */ + if(dev->fd !=3D -1) { + return dev->fd; + } dev->fd =3D alloc_fd(FTYPE_BLK); printk("blk_open(%s) -> %d\n", dev->nodename, dev->fd); files[dev->fd].blk.dev =3D dev; + files[dev->fd].blk.offset =3D 0; return dev->fd; } + +int blkfront_posix_rwop(int fd, uint8_t* buf, size_t count, int write)=20 +{ + struct blkfront_dev* dev =3D files[fd].blk.dev; + off_t offset =3D files[fd].blk.offset; + struct blkfront_aiocb aiocb; + unsigned long long disksize =3D dev->info.sectors * dev->info.sector_= size; + unsigned int blocksize =3D dev->info.sector_size; + + int blknum; + int blkoff; + size_t bytes; + int rc =3D 0; + + /* RW 0 bytes is just a NOP */ + if(count =3D=3D 0) { + return 0; + } + /* Check for NULL buffer */ + if( buf =3D=3D NULL ) { + errno =3D EFAULT; + return -1; + } + /* Write mode checks */ + if(write) { + /*Make sure we have write permission */ + if(dev->info.info & VDISK_READONLY || dev->info.mode !=3D O_RDWR) = { + errno =3D EACCES; + return -1; + } + /*Make sure disk is big enough for this write */ + if(offset + count > disksize) { + errno =3D ENOSPC; + return -1; + } + } + /* Read mode checks */ + else=20 + { + /*If the requested read is bigger than the disk, just=20 + * read as much as we can until the end */ + if(offset + count > disksize) { + count =3D offset >=3D disksize ? 0 : disksize - offset; + } + } + /* Determine which block to start at and which offset inside of it */= + blknum =3D offset / blocksize; + blkoff =3D offset % blocksize; + + /* Setup aiocb block object */ + aiocb.aio_dev =3D dev; + aiocb.aio_buf =3D _xmalloc(blocksize, dev->info.sector_size); + aiocb.aio_nbytes =3D blocksize; + aiocb.aio_offset =3D blknum * blocksize; + aiocb.aio_cb =3D NULL; + aiocb.data =3D NULL; + + rc =3D count; + while(count > 0) { + /* determine how many bytes to read/write from/to the current bloc= k buffer */ + bytes =3D count > (blocksize - blkoff) ? blocksize - blkoff : coun= t; + + /* read operation */ + if(!write) { + aiocb.aio_cb =3D NULL; + blkfront_read(&aiocb); + memcpy(buf, &aiocb.aio_buf[blkoff], bytes); + }=20 + /* Write operation */ + else { + /* If we're writing a partial block, we need to read the current conte= nts first + * so we don't overwrite the extra bits with garbage */ + if(blkoff !=3D 0 || bytes < blocksize) { + aiocb.aio_cb =3D NULL; + blkfront_read(&aiocb); + } + aiocb.aio_cb =3D NULL; + memcpy(&aiocb.aio_buf[blkoff], buf, bytes); + blkfront_write(&aiocb); + } + /* Will start at beginning of all remaining blocks */ + blkoff =3D 0; + + /* Increment counters and continue */ + count -=3D bytes; + buf +=3D bytes; + aiocb.aio_offset +=3D blocksize; + } + + free(aiocb.aio_buf); + files[fd].blk.offset +=3D rc; + return rc; + +} + +int blkfront_posix_fstat(int fd, struct stat* buf)=20 +{ + struct blkfront_dev* dev =3D files[fd].blk.dev; + + buf->st_mode =3D dev->info.mode; + buf->st_uid =3D 0; + buf->st_gid =3D 0; + buf->st_size =3D dev->info.sectors * dev->info.sector_size; + buf->st_atime =3D buf->st_mtime =3D buf->st_ctime =3D time(NULL); + + return 0; +} #endif diff -Naur xen-unstable.hg-pristine/extras/mini-os/include/blkfront.h xen= -unstable.hg/extras/mini-os/include/blkfront.h --- xen-unstable.hg-pristine/extras/mini-os/include/blkfront.h 2011-02-25= 13:28:13.000000000 -0500 +++ xen-unstable.hg/extras/mini-os/include/blkfront.h 2011-02-25 13:21:29= =2E000000000 -0500 @@ -28,7 +28,17 @@ }; struct blkfront_dev *init_blkfront(char *nodename, struct blkfront_info = *info); #ifdef HAVE_LIBC +#include +/* POSIX IO functions: + * use blkfront_open() to get a file descriptor to the block device + * Don't use the other blkfront posix functions here directly, instead u= se=20 + * read(), write(), lseek() and fstat() on the file descriptor + */ int blkfront_open(struct blkfront_dev *dev); +int blkfront_posix_rwop(int fd, uint8_t* buf, size_t count, int write); +#define blkfront_posix_write(fd, buf, count) blkfront_posix_rwop(fd, (ui= nt8_t*)buf, count, 1) +#define blkfront_posix_read(fd, buf, count) blkfront_posix_rwop(fd, (uin= t8_t*)buf, count, 0) +int blkfront_posix_fstat(int fd, struct stat* buf); #endif void blkfront_aio(struct blkfront_aiocb *aiocbp, int write); #define blkfront_aio_read(aiocbp) blkfront_aio(aiocbp, 0) diff -Naur xen-unstable.hg-pristine/extras/mini-os/lib/sys.c xen-unstable= =2Ehg/extras/mini-os/lib/sys.c --- xen-unstable.hg-pristine/extras/mini-os/lib/sys.c 2011-02-25 13:28:13= =2E000000000 -0500 +++ xen-unstable.hg/extras/mini-os/lib/sys.c 2011-02-25 13:27:36.00000000= 0 -0500 @@ -270,6 +270,8 @@ } return ret * sizeof(union xenfb_in_event); } + case FTYPE_BLK: + return blkfront_posix_read(fd, buf, nbytes); default: break; } @@ -300,6 +302,8 @@ case FTYPE_TAP: netfront_xmit(files[fd].tap.dev, (void*) buf, nbytes); return nbytes; + case FTYPE_BLK: + return blkfront_posix_write(fd, buf, nbytes); default: break; } @@ -310,8 +314,35 @@ =20 off_t lseek(int fd, off_t offset, int whence) { - errno =3D ESPIPE; - return (off_t) -1; + switch(files[fd].type) { + case FTYPE_BLK: + switch (whence) { + case SEEK_SET: + files[fd].file.offset =3D offset; + break; + case SEEK_CUR: + files[fd].file.offset +=3D offset; + break; + case SEEK_END:=20 + { + struct stat st; + int ret; + ret =3D fstat(fd, &st); + if (ret) + return -1; + files[fd].file.offset =3D st.st_size + offset; + break; + } + default: + errno =3D EINVAL; + return -1; + } + return files[fd].file.offset; + break; + default: /* Not implemented on this FTYPE */ + errno =3D ESPIPE; + return (off_t) -1; + } } =20 int fsync(int fd) { @@ -412,6 +445,8 @@ buf->st_ctime =3D time(NULL); return 0; } + case FTYPE_BLK: + return blkfront_posix_fstat(fd, buf); default: break; } --------------070403030502030104040906-- --------------ms010704070109050704060801 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 DQEHATAcBgkqhkiG9w0BCQUxDxcNMTEwMzExMjIzNDI2WjAjBgkqhkiG9w0BCQQxFgQUsOMU uEuqoX/EEQirHolFWLJKQfIwRgYJKwYBBAGCNxAEMTkwNzAvMQswCQYDVQQGEwJVUzEPMA0G A1UEChMGSkhVQVBMMQ8wDQYDVQQLEwZCSVNEQ0ECBD/xkcEwSAYLKoZIhvcNAQkQAgsxOaA3 MC8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJU0RDQQIEP/GR wTBfBgkqhkiG9w0BCQ8xUjBQMAsGCWCGSAFlAwQBAjAKBggqhkiG9w0DBzAOBggqhkiG9w0D AgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYIKoZIhvcNAwICASgwDQYJKoZIhvcN AQEBBQAEgYB46cd31kcJZkF1qeLehEFBNrWMLg7dLLXJoucVQv/uMm81+lYpwk4PGP366hBr XeajZ2gCV10Iol7yukiBXv6KwvR5w3e3ummKw/DNVKvyPXUvhyp1ztcevlsMsO6VMGRX0x9U ptbuE4ONHu8WDHNzlP1TZZs/xePG+RMEh2lEiAAAAAAAAA== --------------ms010704070109050704060801-- --===============0463412525== 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 --===============0463412525==--