From: Paul Durrant Subject: [PATCH] xen-block: scale sector based quantities correctly Date: Wed, 20 Mar 2019 16:26:32 +0000 Message-ID: <20190320162633.29479-1-paul.durrant@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1h6e3Z-0006NW-DJ for xen-devel@lists.xenproject.org; Wed, 20 Mar 2019 16:27:09 +0000 List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org, qemu-block@nongnu.org, qemu-devel@nongnu.org Cc: Kevin Wolf , Stefano Stabellini , Max Reitz , Paul Durrant , Stefan Hajnoczi , Anthony Perard List-Id: xen-devel@lists.xenproject.org VGhlIG1haWwgdGhyZWFkIGF0IFsxXSBjbGFyaWZpZXMgdGhhdCB0aGUgWGVuIGJsa2lmIHByb3Rv Y29sIHJlcXVpcmVzIHRoYXQKc2VjdG9yIGJhc2VkIHF1YW50aXRpZXMgc2hvdWxkIGJlIGludGVy cHJldGVkIHN0cmljdGx5IGFzIG11bHRpcGxlcyBvZgo1MTIgYnl0ZXMuIFRoaXMgcGF0Y2ggbW9k aWZpZXMgdGhlIHhlbi1ibG9jayBjb2RlIGFjY29yZGluZ2x5LgoKWzFdIGh0dHBzOi8vbGlzdHMu eGVucHJvamVjdC5vcmcvYXJjaGl2ZXMvaHRtbC94ZW4tZGV2ZWwvMjAxOS0wMy9tc2cwMTYwMC5o dG1sCgpTaWduZWQtb2ZmLWJ5OiBQYXVsIER1cnJhbnQgPHBhdWwuZHVycmFudEBjaXRyaXguY29t PgotLS0KQ2M6IFN0ZWZhbiBIYWpub2N6aSA8c3RlZmFuaGFAcmVkaGF0LmNvbT4KQ2M6IFN0ZWZh bm8gU3RhYmVsbGluaSA8c3N0YWJlbGxpbmlAa2VybmVsLm9yZz4KQ2M6IEFudGhvbnkgUGVyYXJk IDxhbnRob255LnBlcmFyZEBjaXRyaXguY29tPgpDYzogS2V2aW4gV29sZiA8a3dvbGZAcmVkaGF0 LmNvbT4KQ2M6IE1heCBSZWl0eiA8bXJlaXR6QHJlZGhhdC5jb20+Ci0tLQogaHcvYmxvY2svZGF0 YXBsYW5lL3hlbi1ibG9jay5jIHwgMjggKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLQogaHcv YmxvY2sveGVuLWJsb2NrLmMgICAgICAgICAgIHwgIDIgKy0KIGh3L2Jsb2NrL3hlbl9ibGtpZi5o ICAgICAgICAgICB8ICAyICsrCiAzIGZpbGVzIGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKyksIDE2 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2h3L2Jsb2NrL2RhdGFwbGFuZS94ZW4tYmxvY2su YyBiL2h3L2Jsb2NrL2RhdGFwbGFuZS94ZW4tYmxvY2suYwppbmRleCBmMTUyM2M1YjQ1Li5iYjhm MTE4NmU0IDEwMDY0NAotLS0gYS9ody9ibG9jay9kYXRhcGxhbmUveGVuLWJsb2NrLmMKKysrIGIv aHcvYmxvY2svZGF0YXBsYW5lL3hlbi1ibG9jay5jCkBAIC00OSw3ICs0OSw2IEBAIHN0cnVjdCBY ZW5CbG9ja0RhdGFQbGFuZSB7CiAgICAgdW5zaWduZWQgaW50ICpyaW5nX3JlZjsKICAgICB1bnNp Z25lZCBpbnQgbnJfcmluZ19yZWY7CiAgICAgdm9pZCAqc3Jpbmc7Ci0gICAgaW50NjRfdCBmaWxl X2JsazsKICAgICBpbnQgcHJvdG9jb2w7CiAgICAgYmxraWZfYmFja19yaW5nc190IHJpbmdzOwog ICAgIGludCBtb3JlX3dvcms7CkBAIC0xNjgsNyArMTY3LDcgQEAgc3RhdGljIGludCB4ZW5fYmxv Y2tfcGFyc2VfcmVxdWVzdChYZW5CbG9ja1JlcXVlc3QgKnJlcXVlc3QpCiAgICAgICAgIGdvdG8g ZXJyOwogICAgIH0KIAotICAgIHJlcXVlc3QtPnN0YXJ0ID0gcmVxdWVzdC0+cmVxLnNlY3Rvcl9u dW1iZXIgKiBkYXRhcGxhbmUtPmZpbGVfYmxrOworICAgIHJlcXVlc3QtPnN0YXJ0ID0gcmVxdWVz dC0+cmVxLnNlY3Rvcl9udW1iZXIgKiBYRU5fQkxLSUZfU0VDVE9SX1NJWkU7CiAgICAgZm9yIChp ID0gMDsgaSA8IHJlcXVlc3QtPnJlcS5ucl9zZWdtZW50czsgaSsrKSB7CiAgICAgICAgIGlmIChp ID09IEJMS0lGX01BWF9TRUdNRU5UU19QRVJfUkVRVUVTVCkgewogICAgICAgICAgICAgZXJyb3Jf cmVwb3J0KCJlcnJvcjogbnJfc2VnbWVudHMgdG9vIGJpZyIpOwpAQCAtMTc4LDE0ICsxNzcsMTQg QEAgc3RhdGljIGludCB4ZW5fYmxvY2tfcGFyc2VfcmVxdWVzdChYZW5CbG9ja1JlcXVlc3QgKnJl cXVlc3QpCiAgICAgICAgICAgICBlcnJvcl9yZXBvcnQoImVycm9yOiBmaXJzdCA+IGxhc3Qgc2Vj dG9yIik7CiAgICAgICAgICAgICBnb3RvIGVycjsKICAgICAgICAgfQotICAgICAgICBpZiAocmVx dWVzdC0+cmVxLnNlZ1tpXS5sYXN0X3NlY3QgKiBkYXRhcGxhbmUtPmZpbGVfYmxrID49CisgICAg ICAgIGlmIChyZXF1ZXN0LT5yZXEuc2VnW2ldLmxhc3Rfc2VjdCAqIFhFTl9CTEtJRl9TRUNUT1Jf U0laRSA+PQogICAgICAgICAgICAgWENfUEFHRV9TSVpFKSB7CiAgICAgICAgICAgICBlcnJvcl9y ZXBvcnQoImVycm9yOiBwYWdlIGNyb3NzaW5nIik7CiAgICAgICAgICAgICBnb3RvIGVycjsKICAg ICAgICAgfQogCiAgICAgICAgIGxlbiA9IChyZXF1ZXN0LT5yZXEuc2VnW2ldLmxhc3Rfc2VjdCAt Ci0gICAgICAgICAgICAgICByZXF1ZXN0LT5yZXEuc2VnW2ldLmZpcnN0X3NlY3QgKyAxKSAqIGRh dGFwbGFuZS0+ZmlsZV9ibGs7CisgICAgICAgICAgICAgICByZXF1ZXN0LT5yZXEuc2VnW2ldLmZp cnN0X3NlY3QgKyAxKSAqIFhFTl9CTEtJRl9TRUNUT1JfU0laRTsKICAgICAgICAgcmVxdWVzdC0+ c2l6ZSArPSBsZW47CiAgICAgfQogICAgIGlmIChyZXF1ZXN0LT5zdGFydCArIHJlcXVlc3QtPnNp emUgPiBibGtfZ2V0bGVuZ3RoKGRhdGFwbGFuZS0+YmxrKSkgewpAQCAtMjA1LDcgKzIwNCw2IEBA IHN0YXRpYyBpbnQgeGVuX2Jsb2NrX2NvcHlfcmVxdWVzdChYZW5CbG9ja1JlcXVlc3QgKnJlcXVl c3QpCiAgICAgWGVuRGV2aWNlICp4ZW5kZXYgPSBkYXRhcGxhbmUtPnhlbmRldjsKICAgICBYZW5E ZXZpY2VHcmFudENvcHlTZWdtZW50IHNlZ3NbQkxLSUZfTUFYX1NFR01FTlRTX1BFUl9SRVFVRVNU XTsKICAgICBpbnQgaSwgY291bnQ7Ci0gICAgaW50NjRfdCBmaWxlX2JsayA9IGRhdGFwbGFuZS0+ ZmlsZV9ibGs7CiAgICAgYm9vbCB0b19kb21haW4gPSAocmVxdWVzdC0+cmVxLm9wZXJhdGlvbiA9 PSBCTEtJRl9PUF9SRUFEKTsKICAgICB2b2lkICp2aXJ0ID0gcmVxdWVzdC0+YnVmOwogICAgIEVy cm9yICpsb2NhbF9lcnIgPSBOVUxMOwpAQCAtMjIwLDE2ICsyMTgsMTcgQEAgc3RhdGljIGludCB4 ZW5fYmxvY2tfY29weV9yZXF1ZXN0KFhlbkJsb2NrUmVxdWVzdCAqcmVxdWVzdCkKICAgICAgICAg aWYgKHRvX2RvbWFpbikgewogICAgICAgICAgICAgc2Vnc1tpXS5kZXN0LmZvcmVpZ24ucmVmID0g cmVxdWVzdC0+cmVxLnNlZ1tpXS5ncmVmOwogICAgICAgICAgICAgc2Vnc1tpXS5kZXN0LmZvcmVp Z24ub2Zmc2V0ID0gcmVxdWVzdC0+cmVxLnNlZ1tpXS5maXJzdF9zZWN0ICoKLSAgICAgICAgICAg ICAgICBmaWxlX2JsazsKKyAgICAgICAgICAgICAgICBYRU5fQkxLSUZfU0VDVE9SX1NJWkU7CiAg ICAgICAgICAgICBzZWdzW2ldLnNvdXJjZS52aXJ0ID0gdmlydDsKICAgICAgICAgfSBlbHNlIHsK ICAgICAgICAgICAgIHNlZ3NbaV0uc291cmNlLmZvcmVpZ24ucmVmID0gcmVxdWVzdC0+cmVxLnNl Z1tpXS5ncmVmOwogICAgICAgICAgICAgc2Vnc1tpXS5zb3VyY2UuZm9yZWlnbi5vZmZzZXQgPSBy ZXF1ZXN0LT5yZXEuc2VnW2ldLmZpcnN0X3NlY3QgKgotICAgICAgICAgICAgICAgIGZpbGVfYmxr OworICAgICAgICAgICAgICAgIFhFTl9CTEtJRl9TRUNUT1JfU0laRTsKICAgICAgICAgICAgIHNl Z3NbaV0uZGVzdC52aXJ0ID0gdmlydDsKICAgICAgICAgfQogICAgICAgICBzZWdzW2ldLmxlbiA9 IChyZXF1ZXN0LT5yZXEuc2VnW2ldLmxhc3Rfc2VjdCAtCi0gICAgICAgICAgICAgICAgICAgICAg IHJlcXVlc3QtPnJlcS5zZWdbaV0uZmlyc3Rfc2VjdCArIDEpICogZmlsZV9ibGs7CisgICAgICAg ICAgICAgICAgICAgICAgIHJlcXVlc3QtPnJlcS5zZWdbaV0uZmlyc3Rfc2VjdCArIDEpICoKKyAg ICAgICAgICAgICAgICAgICAgICBYRU5fQkxLSUZfU0VDVE9SX1NJWkU7CiAgICAgICAgIHZpcnQg Kz0gc2Vnc1tpXS5sZW47CiAgICAgfQogCkBAIC0zMzEsMjIgKzMzMCwyMiBAQCBzdGF0aWMgYm9v bCB4ZW5fYmxvY2tfc3BsaXRfZGlzY2FyZChYZW5CbG9ja1JlcXVlc3QgKnJlcXVlc3QsCiAgICAg WGVuQmxvY2tEYXRhUGxhbmUgKmRhdGFwbGFuZSA9IHJlcXVlc3QtPmRhdGFwbGFuZTsKICAgICBp bnQ2NF90IGJ5dGVfb2Zmc2V0OwogICAgIGludCBieXRlX2NodW5rOwotICAgIHVpbnQ2NF90IGJ5 dGVfcmVtYWluaW5nLCBsaW1pdDsKKyAgICB1aW50NjRfdCBieXRlX3JlbWFpbmluZzsKICAgICB1 aW50NjRfdCBzZWNfc3RhcnQgPSBzZWN0b3JfbnVtYmVyOwogICAgIHVpbnQ2NF90IHNlY19jb3Vu dCA9IG5yX3NlY3RvcnM7CiAKICAgICAvKiBXcmFwIGFyb3VuZCwgb3Igb3ZlcmZsb3dpbmcgYnl0 ZSBsaW1pdD8gKi8KICAgICBpZiAoc2VjX3N0YXJ0ICsgc2VjX2NvdW50IDwgc2VjX2NvdW50IHx8 Ci0gICAgICAgIHNlY19zdGFydCArIHNlY19jb3VudCA+IElOVDY0X01BWCAvIGRhdGFwbGFuZS0+ ZmlsZV9ibGspIHsKKyAgICAgICAgc2VjX3N0YXJ0ICsgc2VjX2NvdW50ID4gSU5UNjRfTUFYIC8g WEVOX0JMS0lGX1NFQ1RPUl9TSVpFKSB7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAK LSAgICBsaW1pdCA9IEJEUlZfUkVRVUVTVF9NQVhfU0VDVE9SUyAqIGRhdGFwbGFuZS0+ZmlsZV9i bGs7Ci0gICAgYnl0ZV9vZmZzZXQgPSBzZWNfc3RhcnQgKiBkYXRhcGxhbmUtPmZpbGVfYmxrOwot ICAgIGJ5dGVfcmVtYWluaW5nID0gc2VjX2NvdW50ICogZGF0YXBsYW5lLT5maWxlX2JsazsKKyAg ICBieXRlX29mZnNldCA9IHNlY19zdGFydCAqIFhFTl9CTEtJRl9TRUNUT1JfU0laRTsKKyAgICBi eXRlX3JlbWFpbmluZyA9IHNlY19jb3VudCAqIFhFTl9CTEtJRl9TRUNUT1JfU0laRTsKIAogICAg IGRvIHsKLSAgICAgICAgYnl0ZV9jaHVuayA9IGJ5dGVfcmVtYWluaW5nID4gbGltaXQgPyBsaW1p dCA6IGJ5dGVfcmVtYWluaW5nOworICAgICAgICBieXRlX2NodW5rID0gYnl0ZV9yZW1haW5pbmcg PiBCRFJWX1JFUVVFU1RfTUFYX0JZVEVTID8KKyAgICAgICAgICAgIEJEUlZfUkVRVUVTVF9NQVhf QllURVMgOiBieXRlX3JlbWFpbmluZzsKICAgICAgICAgcmVxdWVzdC0+YWlvX2luZmxpZ2h0Kys7 CiAgICAgICAgIGJsa19haW9fcGRpc2NhcmQoZGF0YXBsYW5lLT5ibGssIGJ5dGVfb2Zmc2V0LCBi eXRlX2NodW5rLAogICAgICAgICAgICAgICAgICAgICAgICAgIHhlbl9ibG9ja19jb21wbGV0ZV9h aW8sIHJlcXVlc3QpOwpAQCAtNjMyLDcgKzYzMSw2IEBAIFhlbkJsb2NrRGF0YVBsYW5lICp4ZW5f YmxvY2tfZGF0YXBsYW5lX2NyZWF0ZShYZW5EZXZpY2UgKnhlbmRldiwKICAgICBYZW5CbG9ja0Rh dGFQbGFuZSAqZGF0YXBsYW5lID0gZ19uZXcwKFhlbkJsb2NrRGF0YVBsYW5lLCAxKTsKIAogICAg IGRhdGFwbGFuZS0+eGVuZGV2ID0geGVuZGV2OwotICAgIGRhdGFwbGFuZS0+ZmlsZV9ibGsgPSBj b25mLT5sb2dpY2FsX2Jsb2NrX3NpemU7CiAgICAgZGF0YXBsYW5lLT5ibGsgPSBjb25mLT5ibGs7 CiAKICAgICBRTElTVF9JTklUKCZkYXRhcGxhbmUtPmluZmxpZ2h0KTsKZGlmZiAtLWdpdCBhL2h3 L2Jsb2NrL3hlbi1ibG9jay5jIGIvaHcvYmxvY2sveGVuLWJsb2NrLmMKaW5kZXggYTg0ODg0OWY0 OC4uNTdlOWRhN2UxYyAxMDA2NDQKLS0tIGEvaHcvYmxvY2sveGVuLWJsb2NrLmMKKysrIGIvaHcv YmxvY2sveGVuLWJsb2NrLmMKQEAgLTE0OSw3ICsxNDksNyBAQCBzdGF0aWMgdm9pZCB4ZW5fYmxv Y2tfc2V0X3NpemUoWGVuQmxvY2tEZXZpY2UgKmJsb2NrZGV2KQogICAgIGNvbnN0IGNoYXIgKnR5 cGUgPSBvYmplY3RfZ2V0X3R5cGVuYW1lKE9CSkVDVChibG9ja2RldikpOwogICAgIFhlbkJsb2Nr VmRldiAqdmRldiA9ICZibG9ja2Rldi0+cHJvcHMudmRldjsKICAgICBCbG9ja0NvbmYgKmNvbmYg PSAmYmxvY2tkZXYtPnByb3BzLmNvbmY7Ci0gICAgaW50NjRfdCBzZWN0b3JzID0gYmxrX2dldGxl bmd0aChjb25mLT5ibGspIC8gY29uZi0+bG9naWNhbF9ibG9ja19zaXplOworICAgIGludDY0X3Qg c2VjdG9ycyA9IGJsa19nZXRsZW5ndGgoY29uZi0+YmxrKSAvIFhFTl9CTEtJRl9TRUNUT1JfU0la RTsKICAgICBYZW5EZXZpY2UgKnhlbmRldiA9IFhFTl9ERVZJQ0UoYmxvY2tkZXYpOwogCiAgICAg dHJhY2VfeGVuX2Jsb2NrX3NpemUodHlwZSwgdmRldi0+ZGlzaywgdmRldi0+cGFydGl0aW9uLCBz ZWN0b3JzKTsKZGlmZiAtLWdpdCBhL2h3L2Jsb2NrL3hlbl9ibGtpZi5oIGIvaHcvYmxvY2sveGVu X2Jsa2lmLmgKaW5kZXggM2U2ZTFlYTM2NS4uYTM1MzY5M2VhMCAxMDA2NDQKLS0tIGEvaHcvYmxv Y2sveGVuX2Jsa2lmLmgKKysrIGIvaHcvYmxvY2sveGVuX2Jsa2lmLmgKQEAgLTE0Myw0ICsxNDMs NiBAQCBzdGF0aWMgaW5saW5lIHZvaWQgYmxraWZfZ2V0X3g4Nl82NF9yZXEoYmxraWZfcmVxdWVz dF90ICpkc3QsCiAgICAgfQogfQogCisjZGVmaW5lIFhFTl9CTEtJRl9TRUNUT1JfU0laRSA1MTIK KwogI2VuZGlmIC8qIFhFTl9CTEtJRl9IICovCi0tIAoyLjIwLjEuMi5nYjIxZWJiNgoKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWls aW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVu cHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=