From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Richard W.M. Jones" Subject: 'info blockstats' to collect block device statistics Date: Mon, 03 Dec 2007 19:16:07 +0000 Message-ID: <475455F7.4090407@redhat.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1139903379==" To: kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Errors-To: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: kvm.vger.kernel.org This is a cryptographically signed message in MIME format. --===============1139903379== Content-Type: multipart/signed; protocol="application/x-pkcs7-signature"; micalg=sha1; boundary="------------ms000901000507080302090704" This is a cryptographically signed message in MIME format. --------------ms000901000507080302090704 Content-Type: multipart/mixed; boundary="------------070608060500080407090504" This is a multi-part message in MIME format. --------------070608060500080407090504 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit I wonder if KVM would be interested in taking my QEMU patch to support block device statistics. This patch collects per-block-device statistics and allows them to be displayed in the monitor through a 'info blockstats' command. It generalises the VMDK-only support for this which was added to KVM's version of QEMU. Proposed patch: http://lists.gnu.org/archive/html/qemu-devel/2007-11/msg00770.html Accepted into QEMU: http://lists.gnu.org/archive/html/qemu-devel/2007-12/msg00013.html The QEMU patch doesn't quite apply directly because KVM has no file qemu/block.h. Attached is a rebased patch against the current kvm-userspace. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903 --------------070608060500080407090504 Content-Type: text/x-patch; name="kvm-blockstats.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="kvm-blockstats.patch" diff --git a/qemu/block.c b/qemu/block.c index 20d2e1c..20296c5 100644 --- a/qemu/block.c +++ b/qemu/block.c @@ -518,8 +518,11 @@ int bdrv_read(BlockDriverState *bs, int64_t sector_num, return ret; else if (ret != len) return -EINVAL; - else + else { + bs->rd_bytes += (unsigned) len; + bs->rd_ops ++; return 0; + } } else { return drv->bdrv_read(bs, sector_num, buf, nb_sectors); } @@ -550,8 +553,11 @@ int bdrv_write(BlockDriverState *bs, int64_t sector_num, return ret; else if (ret != len) return -EIO; - else + else { + bs->wr_bytes += (unsigned) len; + bs->wr_ops ++; return 0; + } } else { return drv->bdrv_write(bs, sector_num, buf, nb_sectors); } @@ -914,6 +920,25 @@ void bdrv_info(void) } } +/* The "info blockstats" command. */ +void bdrv_info_stats (void) +{ + BlockDriverState *bs; + + for (bs = bdrv_first; bs != NULL; bs = bs->next) { + term_printf ("%s:" + " rd_bytes=%" PRIu64 + " wr_bytes=%" PRIu64 + " rd_operations=%" PRIu64 + " wr_operations=%" PRIu64 + "\n", + bs->device_name, + bs->rd_bytes, bs->wr_bytes, + bs->rd_ops, bs->wr_ops); + } +} + + void bdrv_get_backing_filename(BlockDriverState *bs, char *filename, int filename_size) { @@ -1074,6 +1099,7 @@ BlockDriverAIOCB *bdrv_aio_read(BlockDriverState *bs, int64_t sector_num, BlockDriverCompletionFunc *cb, void *opaque) { BlockDriver *drv = bs->drv; + BlockDriverAIOCB *ret; if (!drv) return NULL; @@ -1086,7 +1112,15 @@ BlockDriverAIOCB *bdrv_aio_read(BlockDriverState *bs, int64_t sector_num, buf += 512; } - return drv->bdrv_aio_read(bs, sector_num, buf, nb_sectors, cb, opaque); + ret = drv->bdrv_aio_read(bs, sector_num, buf, nb_sectors, cb, opaque); + + if (ret) { + /* Update stats even though technically transfer has not happened. */ + bs->rd_bytes += (unsigned) nb_sectors * SECTOR_SIZE; + bs->rd_ops ++; + } + + return ret; } BlockDriverAIOCB *bdrv_aio_write(BlockDriverState *bs, int64_t sector_num, @@ -1094,6 +1128,7 @@ BlockDriverAIOCB *bdrv_aio_write(BlockDriverState *bs, int64_t sector_num, BlockDriverCompletionFunc *cb, void *opaque) { BlockDriver *drv = bs->drv; + BlockDriverAIOCB *ret; if (!drv) return NULL; @@ -1103,7 +1138,15 @@ BlockDriverAIOCB *bdrv_aio_write(BlockDriverState *bs, int64_t sector_num, memcpy(bs->boot_sector_data, buf, 512); } - return drv->bdrv_aio_write(bs, sector_num, buf, nb_sectors, cb, opaque); + ret = drv->bdrv_aio_write(bs, sector_num, buf, nb_sectors, cb, opaque); + + if (ret) { + /* Update stats even though technically transfer has not happened. */ + bs->wr_bytes += (unsigned) nb_sectors * SECTOR_SIZE; + bs->wr_ops ++; + } + + return ret; } void bdrv_aio_cancel(BlockDriverAIOCB *acb) diff --git a/qemu/block_int.h b/qemu/block_int.h index b034023..d3f9fda 100644 --- a/qemu/block_int.h +++ b/qemu/block_int.h @@ -112,6 +112,12 @@ struct BlockDriverState { void *sync_aiocb; + /* I/O stats (display with "info blockstats"). */ + uint64_t rd_bytes; + uint64_t wr_bytes; + uint64_t rd_ops; + uint64_t wr_ops; + /* NOTE: the following infos are only hints for real hardware drivers. They are not used by the block driver */ int cyls, heads, secs, translation; diff --git a/qemu/monitor.c b/qemu/monitor.c index 10e0af9..a7f4490 100644 --- a/qemu/monitor.c +++ b/qemu/monitor.c @@ -251,6 +251,11 @@ static void do_info_block(void) bdrv_info(); } +static void do_info_blockstats(void) +{ + bdrv_info_stats(); +} + /* get the current CPU defined by the user */ int mon_set_cpu(int cpu_index) { @@ -1389,6 +1394,8 @@ static term_cmd_t info_cmds[] = { "", "show the network state" }, { "block", "", do_info_block, "", "show the block devices" }, + { "blockstats", "", do_info_blockstats, + "", "show block device statistics" }, { "registers", "", do_info_registers, "", "show the cpu registers" }, { "cpus", "", do_info_cpus, diff --git a/qemu/vl.h b/qemu/vl.h index 01aeabc..c07a104 100644 --- a/qemu/vl.h +++ b/qemu/vl.h @@ -729,6 +729,7 @@ void bdrv_set_change_cb(BlockDriverState *bs, void (*change_cb)(void *opaque), void *opaque); void bdrv_get_format(BlockDriverState *bs, char *buf, int buf_size); void bdrv_info(void); +void bdrv_info_stats(void); BlockDriverState *bdrv_find(const char *name); void bdrv_iterate(void (*it)(void *opaque, const char *name), void *opaque); int bdrv_is_encrypted(BlockDriverState *bs); --------------070608060500080407090504-- --------------ms000901000507080302090704 Content-Type: application/x-pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIJAzCC AtwwggJFoAMCAQICEAS4dW+HXx5T2s1p+JnOIgkwDQYJKoZIhvcNAQEFBQAwYjELMAkGA1UE BhMCWkExJTAjBgNVBAoTHFRoYXd0ZSBDb25zdWx0aW5nIChQdHkpIEx0ZC4xLDAqBgNVBAMT I1RoYXd0ZSBQZXJzb25hbCBGcmVlbWFpbCBJc3N1aW5nIENBMB4XDTA3MDIxOTEwMDIxOFoX DTA4MDIxOTEwMDIxOFowQzEfMB0GA1UEAxMWVGhhd3RlIEZyZWVtYWlsIE1lbWJlcjEgMB4G CSqGSIb3DQEJARYRcmpvbmVzQHJlZGhhdC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw ggEKAoIBAQDPJ872hlyuT89WhxOjsWO6ZmnJXFozZHACO5WRaOGKE63VWbYdrWrW2zhV11ND kiZ5nI2IZoN2sga57/bLs1Wcc3W7VCEQ/vP+YqnzvzBPnt9e1gD/Rte64hiNeP58cGjbzjMx AcBa1ICHzwniYxEP1QAiSu0Hk6ecRiMVVXYxCwa1D46klRkVPtQT89EIXS5Z4EOqQy83UZh/ XdgcsadaRxsgkQNgOif6M1pR149uuW0STunhuaNBz8eNRKFTkmn7Mb+claNdiedViabqgbOt F7NJjPPivv/aBEPb7e2cRa/SSdziRFZUA5w8Kvpr6JQW6cipV2KwnAMJOwhlgjMlAgMBAAGj LjAsMBwGA1UdEQQVMBOBEXJqb25lc0ByZWRoYXQuY29tMAwGA1UdEwEB/wQCMAAwDQYJKoZI hvcNAQEFBQADgYEAwQGFC+ULhnDVOGH/1FhxI7v56HVlKkkXk7Xazf3m/vk3s6lBjrUW9VAe c7f8uGEIRAyDsWQN/yyVxmwRFleEK6UiZFIOVTTH0Pcb5XSibBO5v7y3TILeqtGQcRYJwT0m 1K5LkZobCUGeZgw0KjCFeLzPzlxv7efYBheyJyFoRB4wggLcMIICRaADAgECAhAEuHVvh18e U9rNafiZziIJMA0GCSqGSIb3DQEBBQUAMGIxCzAJBgNVBAYTAlpBMSUwIwYDVQQKExxUaGF3 dGUgQ29uc3VsdGluZyAoUHR5KSBMdGQuMSwwKgYDVQQDEyNUaGF3dGUgUGVyc29uYWwgRnJl ZW1haWwgSXNzdWluZyBDQTAeFw0wNzAyMTkxMDAyMThaFw0wODAyMTkxMDAyMThaMEMxHzAd BgNVBAMTFlRoYXd0ZSBGcmVlbWFpbCBNZW1iZXIxIDAeBgkqhkiG9w0BCQEWEXJqb25lc0By ZWRoYXQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzyfO9oZcrk/PVocT o7FjumZpyVxaM2RwAjuVkWjhihOt1Vm2Ha1q1ts4VddTQ5ImeZyNiGaDdrIGue/2y7NVnHN1 u1QhEP7z/mKp878wT57fXtYA/0bXuuIYjXj+fHBo284zMQHAWtSAh88J4mMRD9UAIkrtB5On nEYjFVV2MQsGtQ+OpJUZFT7UE/PRCF0uWeBDqkMvN1GYf13YHLGnWkcbIJEDYDon+jNaUdeP brltEk7p4bmjQc/HjUShU5Jp+zG/nJWjXYnnVYmm6oGzrRezSYzz4r7/2gRD2+3tnEWv0knc 4kRWVAOcPCr6a+iUFunIqVdisJwDCTsIZYIzJQIDAQABoy4wLDAcBgNVHREEFTATgRFyam9u ZXNAcmVkaGF0LmNvbTAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBBQUAA4GBAMEBhQvlC4Zw 1Thh/9RYcSO7+eh1ZSpJF5O12s395v75N7OpQY61FvVQHnO3/LhhCEQMg7FkDf8slcZsERZX hCulImRSDlU0x9D3G+V0omwTub+8t0yC3qrRkHEWCcE9JtSuS5GaGwlBnmYMNCowhXi8z85c b+3n2AYXsichaEQeMIIDPzCCAqigAwIBAgIBDTANBgkqhkiG9w0BAQUFADCB0TELMAkGA1UE BhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMRowGAYD VQQKExFUaGF3dGUgQ29uc3VsdGluZzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNl cyBEaXZpc2lvbjEkMCIGA1UEAxMbVGhhd3RlIFBlcnNvbmFsIEZyZWVtYWlsIENBMSswKQYJ KoZIhvcNAQkBFhxwZXJzb25hbC1mcmVlbWFpbEB0aGF3dGUuY29tMB4XDTAzMDcxNzAwMDAw MFoXDTEzMDcxNjIzNTk1OVowYjELMAkGA1UEBhMCWkExJTAjBgNVBAoTHFRoYXd0ZSBDb25z dWx0aW5nIChQdHkpIEx0ZC4xLDAqBgNVBAMTI1RoYXd0ZSBQZXJzb25hbCBGcmVlbWFpbCBJ c3N1aW5nIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDEpjxVc1X7TrnKmVoeaMB1 BHCd3+n/ox7svc31W/Iadr1/DDph8r9RzgHU5VAKMNcCY1osiRVwjt3J8CuFWqo/cVbLrzwL B+fxH5E2JCoTzyvV84J3PQO+K/67GD4Hv0CAAmTXp6a7n2XRxSpUhQ9IBH+nttE8YQRAHmQZ cmC3+wIDAQABo4GUMIGRMBIGA1UdEwEB/wQIMAYBAf8CAQAwQwYDVR0fBDwwOjA4oDagNIYy aHR0cDovL2NybC50aGF3dGUuY29tL1RoYXd0ZVBlcnNvbmFsRnJlZW1haWxDQS5jcmwwCwYD VR0PBAQDAgEGMCkGA1UdEQQiMCCkHjAcMRowGAYDVQQDExFQcml2YXRlTGFiZWwyLTEzODAN BgkqhkiG9w0BAQUFAAOBgQBIjNFQg+oLLswNo2asZw9/r6y+whehQ5aUnX9MIbj4Nh+qLZ82 L8D0HFAgk3A8/a3hYWLD2ToZfoSxmRsAxRoLgnSeJVCUYsfbJ3FXJY3dqZw5jowgT2Vfldr3 94fWxghOrvbqNOUQGls1TXfjViF4gtwhGTXeJLHTHUb/XV9lTzGCA2QwggNgAgEBMHYwYjEL MAkGA1UEBhMCWkExJTAjBgNVBAoTHFRoYXd0ZSBDb25zdWx0aW5nIChQdHkpIEx0ZC4xLDAq BgNVBAMTI1RoYXd0ZSBQZXJzb25hbCBGcmVlbWFpbCBJc3N1aW5nIENBAhAEuHVvh18eU9rN afiZziIJMAkGBSsOAwIaBQCgggHDMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZI hvcNAQkFMQ8XDTA3MTIwMzE5MTYwN1owIwYJKoZIhvcNAQkEMRYEFFlkH9BxsKIYWhAqyG8Y W71cM8JAMFIGCSqGSIb3DQEJDzFFMEMwCgYIKoZIhvcNAwcwDgYIKoZIhvcNAwICAgCAMA0G CCqGSIb3DQMCAgFAMAcGBSsOAwIHMA0GCCqGSIb3DQMCAgEoMIGFBgkrBgEEAYI3EAQxeDB2 MGIxCzAJBgNVBAYTAlpBMSUwIwYDVQQKExxUaGF3dGUgQ29uc3VsdGluZyAoUHR5KSBMdGQu MSwwKgYDVQQDEyNUaGF3dGUgUGVyc29uYWwgRnJlZW1haWwgSXNzdWluZyBDQQIQBLh1b4df HlPazWn4mc4iCTCBhwYLKoZIhvcNAQkQAgsxeKB2MGIxCzAJBgNVBAYTAlpBMSUwIwYDVQQK ExxUaGF3dGUgQ29uc3VsdGluZyAoUHR5KSBMdGQuMSwwKgYDVQQDEyNUaGF3dGUgUGVyc29u YWwgRnJlZW1haWwgSXNzdWluZyBDQQIQBLh1b4dfHlPazWn4mc4iCTANBgkqhkiG9w0BAQEF AASCAQBCtv7kwudao55ut5hSojGZV15wJjbk7e2bItw8EFbV42nEsXUW4aFdxF6UeuSduEsR pNslZJkUcbHkN68pe7e0ZhQzKC8i1QtiED5z8NBn1tT2AwD+wXZU9nLBpBOFO/964ccZXXKz DC5PlR4a9HUuEByb93hNwetzPNKyvGK4wlPP/pXihQjek360MOqpV9Fogz/Vjz0b9YnBLsiC +TshAlRuS4ehPcvKfswhqbO/4qEJLjk7JyF7lBgtrGQcRvbJQNYon9mcsMJtFfxkkwA9FTAL 3iEbvj4SbQSCn8h9LoAQFDiDeQi61bVayQ8arAZA/XViDnN+SQuXkDoljalsAAAAAAAA --------------ms000901000507080302090704-- --===============1139903379== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline ------------------------------------------------------------------------- SF.Net email is sponsored by: The Future of Linux Business White Paper from Novell. From the desktop to the data center, Linux is going mainstream. Let it simplify your IT future. http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4 --===============1139903379== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ kvm-devel mailing list kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org https://lists.sourceforge.net/lists/listinfo/kvm-devel --===============1139903379==--