From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Durrant Subject: [PATCH v2 REPOST 10/12] x86/hvm/ioreq: use gfn_t in struct hvm_ioreq_page Date: Tue, 22 Aug 2017 15:51:04 +0100 Message-ID: <20170822145107.6877-11-paul.durrant@citrix.com> References: <20170822145107.6877-1-paul.durrant@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dkAv9-0004vt-D3 for xen-devel@lists.xenproject.org; Tue, 22 Aug 2017 15:16:47 +0000 In-Reply-To: <20170822145107.6877-1-paul.durrant@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Andrew Cooper , Paul Durrant , Jan Beulich List-Id: xen-devel@lists.xenproject.org VGhpcyBwYXRjaCBhZGp1c3RzIHRoZSBJT1JFUSBzZXJ2ZXIgY29kZSB0byB1c2UgdHlwZS1zYWZl IGdmbl90IHZhbHVlcwp3aGVyZSBwb3NzaWJsZS4gTm8gZnVuY3Rpb25hbCBjaGFuZ2UuCgpTaWdu ZWQtb2ZmLWJ5OiBQYXVsIER1cnJhbnQgPHBhdWwuZHVycmFudEBjaXRyaXguY29tPgotLS0KQ2M6 IEFuZHJldyBDb29wZXIgPGFuZHJldy5jb29wZXIzQGNpdHJpeC5jb20+CkNjOiBKYW4gQmV1bGlj aCA8amJldWxpY2hAc3VzZS5jb20+Ci0tLQogeGVuL2FyY2gveDg2L2h2bS9pb3JlcS5jICAgICAg ICAgfCA0MiArKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiB4ZW4vaW5j bHVkZS9hc20teDg2L2h2bS9kb21haW4uaCB8ICAyICstCiAyIGZpbGVzIGNoYW5nZWQsIDIyIGlu c2VydGlvbnMoKyksIDIyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9o dm0vaW9yZXEuYyBiL3hlbi9hcmNoL3g4Ni9odm0vaW9yZXEuYwppbmRleCBlZGZiMzk0YzU5Li4z YTlhYWYxZjVkIDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvaHZtL2lvcmVxLmMKKysrIGIveGVu L2FyY2gveDg2L2h2bS9pb3JlcS5jCkBAIC0xODEsNyArMTgxLDcgQEAgYm9vbCBoYW5kbGVfaHZt X2lvX2NvbXBsZXRpb24oc3RydWN0IHZjcHUgKnYpCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXN0 YXRpYyB1bnNpZ25lZCBsb25nIGh2bV9hbGxvY19pb3JlcV9nZm4oc3RydWN0IGh2bV9pb3JlcV9z ZXJ2ZXIgKnMpCitzdGF0aWMgZ2ZuX3QgaHZtX2FsbG9jX2lvcmVxX2dmbihzdHJ1Y3QgaHZtX2lv cmVxX3NlcnZlciAqcykKIHsKICAgICBzdHJ1Y3QgZG9tYWluICpkID0gcy0+ZG9tYWluOwogICAg IHVuc2lnbmVkIGludCBpOwpAQCAtMTkyLDE4ICsxOTIsMTcgQEAgc3RhdGljIHVuc2lnbmVkIGxv bmcgaHZtX2FsbG9jX2lvcmVxX2dmbihzdHJ1Y3QgaHZtX2lvcmVxX3NlcnZlciAqcykKICAgICB7 CiAgICAgICAgIGlmICggdGVzdF9hbmRfY2xlYXJfYml0KGksICZkLT5hcmNoLmh2bV9kb21haW4u aW9yZXFfZ2ZuLm1hc2spICkKICAgICAgICAgewotICAgICAgICAgICAgcmV0dXJuIGQtPmFyY2gu aHZtX2RvbWFpbi5pb3JlcV9nZm4uYmFzZSArIGk7CisgICAgICAgICAgICByZXR1cm4gX2dmbihk LT5hcmNoLmh2bV9kb21haW4uaW9yZXFfZ2ZuLmJhc2UgKyBpKTsKICAgICAgICAgfQogICAgIH0K IAotICAgIHJldHVybiBnZm5feChJTlZBTElEX0dGTik7CisgICAgcmV0dXJuIElOVkFMSURfR0ZO OwogfQogCi1zdGF0aWMgdm9pZCBodm1fZnJlZV9pb3JlcV9nZm4oc3RydWN0IGh2bV9pb3JlcV9z ZXJ2ZXIgKnMsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBn Zm4pCitzdGF0aWMgdm9pZCBodm1fZnJlZV9pb3JlcV9nZm4oc3RydWN0IGh2bV9pb3JlcV9zZXJ2 ZXIgKnMsIGdmbl90IGdmbikKIHsKICAgICBzdHJ1Y3QgZG9tYWluICpkID0gcy0+ZG9tYWluOwot ICAgIHVuc2lnbmVkIGludCBpID0gZ2ZuIC0gZC0+YXJjaC5odm1fZG9tYWluLmlvcmVxX2dmbi5i YXNlOworICAgIHVuc2lnbmVkIGludCBpID0gZ2ZuX3goZ2ZuKSAtIGQtPmFyY2guaHZtX2RvbWFp bi5pb3JlcV9nZm4uYmFzZTsKIAogICAgIEFTU0VSVCghcy0+aXNfZGVmYXVsdCk7CiAKQEAgLTIx NCw3ICsyMTMsNyBAQCBzdGF0aWMgdm9pZCBodm1fdW5tYXBfaW9yZXFfZ2ZuKHN0cnVjdCBodm1f aW9yZXFfc2VydmVyICpzLCBib29sIGJ1ZikKIHsKICAgICBzdHJ1Y3QgaHZtX2lvcmVxX3BhZ2Ug KmlvcnAgPSBidWYgPyAmcy0+YnVmaW9yZXEgOiAmcy0+aW9yZXE7CiAKLSAgICBpZiAoIGlvcnAt PmdmbiA9PSBnZm5feChJTlZBTElEX0dGTikgKQorICAgIGlmICggZ2ZuX2VxKGlvcnAtPmdmbiwg SU5WQUxJRF9HRk4pICkKICAgICAgICAgcmV0dXJuOwogCiAgICAgZGVzdHJveV9yaW5nX2Zvcl9o ZWxwZXIoJmlvcnAtPnZhLCBpb3JwLT5wYWdlKTsKQEAgLTIyMyw3ICsyMjIsNyBAQCBzdGF0aWMg dm9pZCBodm1fdW5tYXBfaW9yZXFfZ2ZuKHN0cnVjdCBodm1faW9yZXFfc2VydmVyICpzLCBib29s IGJ1ZikKICAgICBpZiAoICFzLT5pc19kZWZhdWx0ICkKICAgICAgICAgaHZtX2ZyZWVfaW9yZXFf Z2ZuKHMsIGlvcnAtPmdmbik7CiAKLSAgICBpb3JwLT5nZm4gPSBnZm5feChJTlZBTElEX0dGTik7 CisgICAgaW9ycC0+Z2ZuID0gSU5WQUxJRF9HRk47CiB9CiAKIHN0YXRpYyBpbnQgaHZtX21hcF9p b3JlcV9nZm4oc3RydWN0IGh2bV9pb3JlcV9zZXJ2ZXIgKnMsIGJvb2wgYnVmKQpAQCAtMjM2LDE2 ICsyMzUsMTcgQEAgc3RhdGljIGludCBodm1fbWFwX2lvcmVxX2dmbihzdHJ1Y3QgaHZtX2lvcmVx X3NlcnZlciAqcywgYm9vbCBidWYpCiAgICAgICAgIHJldHVybiAtRUlOVkFMOwogCiAgICAgaWYg KCBzLT5pc19kZWZhdWx0ICkKLSAgICAgICAgaW9ycC0+Z2ZuID0gYnVmID8KLSAgICAgICAgICAg ICAgICAgICAgZC0+YXJjaC5odm1fZG9tYWluLnBhcmFtc1tIVk1fUEFSQU1fQlVGSU9SRVFfUEZO XSA6Ci0gICAgICAgICAgICAgICAgICAgIGQtPmFyY2guaHZtX2RvbWFpbi5wYXJhbXNbSFZNX1BB UkFNX0lPUkVRX1BGTl07CisgICAgICAgIGlvcnAtPmdmbiA9IF9nZm4oYnVmID8KKyAgICAgICAg ICAgICAgICAgICAgICAgICBkLT5hcmNoLmh2bV9kb21haW4ucGFyYW1zW0hWTV9QQVJBTV9CVUZJ T1JFUV9QRk5dIDoKKyAgICAgICAgICAgICAgICAgICAgICAgICBkLT5hcmNoLmh2bV9kb21haW4u cGFyYW1zW0hWTV9QQVJBTV9JT1JFUV9QRk5dKTsKICAgICBlbHNlCiAgICAgICAgIGlvcnAtPmdm biA9IGh2bV9hbGxvY19pb3JlcV9nZm4ocyk7CiAKLSAgICBpZiAoIGlvcnAtPmdmbiA9PSBnZm5f eChJTlZBTElEX0dGTikgKQorICAgIGlmICggZ2ZuX2VxKGlvcnAtPmdmbiwgSU5WQUxJRF9HRk4p ICkKICAgICAgICAgcmV0dXJuIC1FTk9NRU07CiAKLSAgICByYyA9IHByZXBhcmVfcmluZ19mb3Jf aGVscGVyKGQsIGlvcnAtPmdmbiwgJmlvcnAtPnBhZ2UsICZpb3JwLT52YSk7CisgICAgcmMgPSBw cmVwYXJlX3JpbmdfZm9yX2hlbHBlcihkLCBnZm5feChpb3JwLT5nZm4pLCAmaW9ycC0+cGFnZSwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZpb3JwLT52YSk7CiAKICAgICBpZiAo IHJjICkKICAgICAgICAgaHZtX3VubWFwX2lvcmVxX2dmbihzLCBidWYpOwpAQCAtMjgyLDEwICsy ODIsMTAgQEAgc3RhdGljIHZvaWQgaHZtX3JlbW92ZV9pb3JlcV9nZm4oc3RydWN0IGh2bV9pb3Jl cV9zZXJ2ZXIgKnMsIGJvb2wgYnVmKQogICAgIHN0cnVjdCBkb21haW4gKmQgPSBzLT5kb21haW47 CiAgICAgc3RydWN0IGh2bV9pb3JlcV9wYWdlICppb3JwID0gYnVmID8gJnMtPmJ1ZmlvcmVxIDog JnMtPmlvcmVxOwogCi0gICAgaWYgKCBzLT5pc19kZWZhdWx0IHx8IGlvcnAtPmdmbiA9PSBnZm5f eChJTlZBTElEX0dGTikgKQorICAgIGlmICggcy0+aXNfZGVmYXVsdCB8fCBnZm5fZXEoaW9ycC0+ Z2ZuLCBJTlZBTElEX0dGTikgKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoIGd1ZXN0X3Bo eXNtYXBfcmVtb3ZlX3BhZ2UoZCwgX2dmbihpb3JwLT5nZm4pLAorICAgIGlmICggZ3Vlc3RfcGh5 c21hcF9yZW1vdmVfcGFnZShkLCBpb3JwLT5nZm4sCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIF9tZm4ocGFnZV90b19tZm4oaW9ycC0+cGFnZSkpLCAwKSApCiAgICAgICAgIGRv bWFpbl9jcmFzaChkKTsKICAgICBjbGVhcl9wYWdlKGlvcnAtPnZhKTsKQEAgLTI5NywxMiArMjk3 LDEyIEBAIHN0YXRpYyBpbnQgaHZtX2FkZF9pb3JlcV9nZm4oc3RydWN0IGh2bV9pb3JlcV9zZXJ2 ZXIgKnMsIGJvb2wgYnVmKQogICAgIHN0cnVjdCBodm1faW9yZXFfcGFnZSAqaW9ycCA9IGJ1ZiA/ ICZzLT5idWZpb3JlcSA6ICZzLT5pb3JlcTsKICAgICBpbnQgcmM7CiAKLSAgICBpZiAoIHMtPmlz X2RlZmF1bHQgfHwgaW9ycC0+Z2ZuID09IGdmbl94KElOVkFMSURfR0ZOKSApCisgICAgaWYgKCBz LT5pc19kZWZhdWx0IHx8IGdmbl9lcShpb3JwLT5nZm4sIElOVkFMSURfR0ZOKSApCiAgICAgICAg IHJldHVybiAwOwogCiAgICAgY2xlYXJfcGFnZShpb3JwLT52YSk7CiAKLSAgICByYyA9IGd1ZXN0 X3BoeXNtYXBfYWRkX3BhZ2UoZCwgX2dmbihpb3JwLT5nZm4pLAorICAgIHJjID0gZ3Vlc3RfcGh5 c21hcF9hZGRfcGFnZShkLCBpb3JwLT5nZm4sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIF9tZm4ocGFnZV90b19tZm4oaW9ycC0+cGFnZSkpLCAwKTsKICAgICBpZiAoIHJjID09IDAg KQogICAgICAgICBwYWdpbmdfbWFya19kaXJ0eShkLCBfbWZuKHBhZ2VfdG9fbWZuKGlvcnAtPnBh Z2UpKSk7CkBAIC01NjEsOCArNTYxLDggQEAgc3RhdGljIGludCBodm1faW9yZXFfc2VydmVyX2lu aXQoc3RydWN0IGh2bV9pb3JlcV9zZXJ2ZXIgKnMsCiAgICAgSU5JVF9MSVNUX0hFQUQoJnMtPmlv cmVxX3ZjcHVfbGlzdCk7CiAgICAgc3Bpbl9sb2NrX2luaXQoJnMtPmJ1ZmlvcmVxX2xvY2spOwog Ci0gICAgcy0+aW9yZXEuZ2ZuID0gZ2ZuX3goSU5WQUxJRF9HRk4pOwotICAgIHMtPmJ1ZmlvcmVx LmdmbiA9IGdmbl94KElOVkFMSURfR0ZOKTsKKyAgICBzLT5pb3JlcS5nZm4gPSBJTlZBTElEX0dG TjsKKyAgICBzLT5idWZpb3JlcS5nZm4gPSBJTlZBTElEX0dGTjsKIAogICAgIHJjID0gaHZtX2lv cmVxX3NlcnZlcl9hbGxvY19yYW5nZXNldHMocyk7CiAgICAgaWYgKCByYyApCkBAIC03NDcsMTEg Kzc0NywxMSBAQCBpbnQgaHZtX2dldF9pb3JlcV9zZXJ2ZXJfaW5mbyhzdHJ1Y3QgZG9tYWluICpk LCBpb3NlcnZpZF90IGlkLAogICAgICAgICBpZiAoIHMtPmlkICE9IGlkICkKICAgICAgICAgICAg IGNvbnRpbnVlOwogCi0gICAgICAgICppb3JlcV9nZm4gPSBzLT5pb3JlcS5nZm47CisgICAgICAg ICppb3JlcV9nZm4gPSBnZm5feChzLT5pb3JlcS5nZm4pOwogCiAgICAgICAgIGlmICggcy0+YnVm aW9yZXEudmEgIT0gTlVMTCApCiAgICAgICAgIHsKLSAgICAgICAgICAgICpidWZpb3JlcV9nZm4g PSBzLT5idWZpb3JlcS5nZm47CisgICAgICAgICAgICAqYnVmaW9yZXFfZ2ZuID0gZ2ZuX3gocy0+ YnVmaW9yZXEuZ2ZuKTsKICAgICAgICAgICAgICpidWZpb3JlcV9wb3J0ID0gcy0+YnVmaW9yZXFf ZXZ0Y2huOwogICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL2FzbS14ODYvaHZt L2RvbWFpbi5oIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vZG9tYWluLmgKaW5kZXggMTYzNDRk MTczYi4uN2I5M2QxMDIwOSAxMDA2NDQKLS0tIGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vZG9t YWluLmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vZG9tYWluLmgKQEAgLTM2LDcgKzM2 LDcgQEAKICNpbmNsdWRlIDxwdWJsaWMvaHZtL2RtX29wLmg+CiAKIHN0cnVjdCBodm1faW9yZXFf cGFnZSB7Ci0gICAgdW5zaWduZWQgbG9uZyBnZm47CisgICAgZ2ZuX3QgZ2ZuOwogICAgIHN0cnVj dCBwYWdlX2luZm8gKnBhZ2U7CiAgICAgdm9pZCAqdmE7CiB9OwotLSAKMi4xMS4wCgoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxp bmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVu LWRldmVsCg==