From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Durrant Subject: [PATCH v5 10/12] x86/hvm/ioreq: use gfn_t in struct hvm_ioreq_page Date: Fri, 8 Sep 2017 16:21:35 +0100 Message-ID: <20170908152137.22808-11-paul.durrant@citrix.com> References: <20170908152137.22808-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.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dqLUI-0002VH-LP for xen-devel@lists.xenproject.org; Fri, 08 Sep 2017 15:46:34 +0000 In-Reply-To: <20170908152137.22808-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 VGhpcyBwYXRjaCBhZGp1c3RzIHRoZSBpb3JlcSBzZXJ2ZXIgY29kZSB0byB1c2UgdHlwZS1zYWZl IGdmbl90IHZhbHVlcwp3aGVyZSBwb3NzaWJsZS4gTm8gZnVuY3Rpb25hbCBjaGFuZ2UuCgpTaWdu ZWQtb2ZmLWJ5OiBQYXVsIER1cnJhbnQgPHBhdWwuZHVycmFudEBjaXRyaXguY29tPgpSZXZpZXdl ZC1ieTogUm9nZXIgUGF1IE1vbm7DqSA8cm9nZXIucGF1QGNpdHJpeC5jb20+ClJldmlld2VkLWJ5 OiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29tPgotLS0KQ2M6IEFuZHJldyBDb29wZXIgPGFu ZHJldy5jb29wZXIzQGNpdHJpeC5jb20+CkNjOiBKYW4gQmV1bGljaCA8amJldWxpY2hAc3VzZS5j b20+Ci0tLQogeGVuL2FyY2gveDg2L2h2bS9pb3JlcS5jICAgICAgICAgfCA0NCArKysrKysrKysr KysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiB4ZW4vaW5jbHVkZS9hc20teDg2L2h2bS9k b21haW4uaCB8ICAyICstCiAyIGZpbGVzIGNoYW5nZWQsIDIzIGluc2VydGlvbnMoKyksIDIzIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9odm0vaW9yZXEuYyBiL3hlbi9h cmNoL3g4Ni9odm0vaW9yZXEuYwppbmRleCA5NzgxYTUwNmNjLi41N2RiZTg1MmQ2IDEwMDY0NAot LS0gYS94ZW4vYXJjaC94ODYvaHZtL2lvcmVxLmMKKysrIGIveGVuL2FyY2gveDg2L2h2bS9pb3Jl cS5jCkBAIC0yMTEsNyArMjExLDcgQEAgYm9vbCBoYW5kbGVfaHZtX2lvX2NvbXBsZXRpb24oc3Ry dWN0IHZjcHUgKnYpCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXN0YXRpYyB1bnNpZ25lZCBsb25n IGh2bV9hbGxvY19pb3JlcV9nZm4oc3RydWN0IGh2bV9pb3JlcV9zZXJ2ZXIgKnMpCitzdGF0aWMg Z2ZuX3QgaHZtX2FsbG9jX2lvcmVxX2dmbihzdHJ1Y3QgaHZtX2lvcmVxX3NlcnZlciAqcykKIHsK ICAgICBzdHJ1Y3QgZG9tYWluICpkID0gcy0+ZG9tYWluOwogICAgIHVuc2lnbmVkIGludCBpOwpA QCAtMjIxLDIwICsyMjEsMTkgQEAgc3RhdGljIHVuc2lnbmVkIGxvbmcgaHZtX2FsbG9jX2lvcmVx X2dmbihzdHJ1Y3QgaHZtX2lvcmVxX3NlcnZlciAqcykKICAgICBmb3IgKCBpID0gMDsgaSA8IHNp emVvZihkLT5hcmNoLmh2bV9kb21haW4uaW9yZXFfZ2ZuLm1hc2spICogODsgaSsrICkKICAgICB7 CiAgICAgICAgIGlmICggdGVzdF9hbmRfY2xlYXJfYml0KGksICZkLT5hcmNoLmh2bV9kb21haW4u aW9yZXFfZ2ZuLm1hc2spICkKLSAgICAgICAgICAgIHJldHVybiBkLT5hcmNoLmh2bV9kb21haW4u aW9yZXFfZ2ZuLmJhc2UgKyBpOworICAgICAgICAgICAgcmV0dXJuIF9nZm4oZC0+YXJjaC5odm1f ZG9tYWluLmlvcmVxX2dmbi5iYXNlICsgaSk7CiAgICAgfQogCi0gICAgcmV0dXJuIGdmbl94KElO VkFMSURfR0ZOKTsKKyAgICByZXR1cm4gSU5WQUxJRF9HRk47CiB9CiAKLXN0YXRpYyB2b2lkIGh2 bV9mcmVlX2lvcmVxX2dmbihzdHJ1Y3QgaHZtX2lvcmVxX3NlcnZlciAqcywKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIGdmbikKK3N0YXRpYyB2b2lkIGh2bV9m cmVlX2lvcmVxX2dmbihzdHJ1Y3QgaHZtX2lvcmVxX3NlcnZlciAqcywgZ2ZuX3QgZ2ZuKQogewog ICAgIHN0cnVjdCBkb21haW4gKmQgPSBzLT5kb21haW47Ci0gICAgdW5zaWduZWQgaW50IGkgPSBn Zm4gLSBkLT5hcmNoLmh2bV9kb21haW4uaW9yZXFfZ2ZuLmJhc2U7CisgICAgdW5zaWduZWQgaW50 IGkgPSBnZm5feChnZm4pIC0gZC0+YXJjaC5odm1fZG9tYWluLmlvcmVxX2dmbi5iYXNlOwogCiAg ICAgQVNTRVJUKCFJU19ERUZBVUxUKHMpKTsKLSAgICBBU1NFUlQoZ2ZuICE9IGdmbl94KElOVkFM SURfR0ZOKSk7CisgICAgQVNTRVJUKCFnZm5fZXEoZ2ZuLCBJTlZBTElEX0dGTikpOwogCiAgICAg c2V0X2JpdChpLCAmZC0+YXJjaC5odm1fZG9tYWluLmlvcmVxX2dmbi5tYXNrKTsKIH0KQEAgLTI0 Myw3ICsyNDIsNyBAQCBzdGF0aWMgdm9pZCBodm1fdW5tYXBfaW9yZXFfZ2ZuKHN0cnVjdCBodm1f aW9yZXFfc2VydmVyICpzLCBib29sIGJ1ZikKIHsKICAgICBzdHJ1Y3QgaHZtX2lvcmVxX3BhZ2Ug KmlvcnAgPSBidWYgPyAmcy0+YnVmaW9yZXEgOiAmcy0+aW9yZXE7CiAKLSAgICBpZiAoIGlvcnAt PmdmbiA9PSBnZm5feChJTlZBTElEX0dGTikgKQorICAgIGlmICggZ2ZuX2VxKGlvcnAtPmdmbiwg SU5WQUxJRF9HRk4pICkKICAgICAgICAgcmV0dXJuOwogCiAgICAgZGVzdHJveV9yaW5nX2Zvcl9o ZWxwZXIoJmlvcnAtPnZhLCBpb3JwLT5wYWdlKTsKQEAgLTI1Miw3ICsyNTEsNyBAQCBzdGF0aWMg dm9pZCBodm1fdW5tYXBfaW9yZXFfZ2ZuKHN0cnVjdCBodm1faW9yZXFfc2VydmVyICpzLCBib29s IGJ1ZikKICAgICBpZiAoICFJU19ERUZBVUxUKHMpICkKICAgICAgICAgaHZtX2ZyZWVfaW9yZXFf Z2ZuKHMsIGlvcnAtPmdmbik7CiAKLSAgICBpb3JwLT5nZm4gPSBnZm5feChJTlZBTElEX0dGTik7 CisgICAgaW9ycC0+Z2ZuID0gSU5WQUxJRF9HRk47CiB9CiAKIHN0YXRpYyBpbnQgaHZtX21hcF9p b3JlcV9nZm4oc3RydWN0IGh2bV9pb3JlcV9zZXJ2ZXIgKnMsIGJvb2wgYnVmKQpAQCAtMjY1LDE2 ICsyNjQsMTcgQEAgc3RhdGljIGludCBodm1fbWFwX2lvcmVxX2dmbihzdHJ1Y3QgaHZtX2lvcmVx X3NlcnZlciAqcywgYm9vbCBidWYpCiAgICAgICAgIHJldHVybiAtRUlOVkFMOwogCiAgICAgaWYg KCBJU19ERUZBVUxUKHMpICkKLSAgICAgICAgaW9ycC0+Z2ZuID0gYnVmID8KLSAgICAgICAgICAg ICAgICAgICAgZC0+YXJjaC5odm1fZG9tYWluLnBhcmFtc1tIVk1fUEFSQU1fQlVGSU9SRVFfUEZO XSA6Ci0gICAgICAgICAgICAgICAgICAgIGQtPmFyY2guaHZtX2RvbWFpbi5wYXJhbXNbSFZNX1BB UkFNX0lPUkVRX1BGTl07CisgICAgICAgIGlvcnAtPmdmbiA9IF9nZm4oYnVmID8KKyAgICAgICAg ICAgICAgICAgICAgICAgICBkLT5hcmNoLmh2bV9kb21haW4ucGFyYW1zW0hWTV9QQVJBTV9CVUZJ T1JFUV9QRk5dIDoKKyAgICAgICAgICAgICAgICAgICAgICAgICBkLT5hcmNoLmh2bV9kb21haW4u cGFyYW1zW0hWTV9QQVJBTV9JT1JFUV9QRk5dKTsKICAgICBlbHNlCiAgICAgICAgIGlvcnAtPmdm biA9IGh2bV9hbGxvY19pb3JlcV9nZm4ocyk7CiAKLSAgICBpZiAoIGlvcnAtPmdmbiA9PSBnZm5f eChJTlZBTElEX0dGTikgKQorICAgIGlmICggZ2ZuX2VxKGlvcnAtPmdmbiwgSU5WQUxJRF9HRk4p ICkKICAgICAgICAgcmV0dXJuIC1FTk9NRU07CiAKLSAgICByYyA9IHByZXBhcmVfcmluZ19mb3Jf aGVscGVyKGQsIGlvcnAtPmdmbiwgJmlvcnAtPnBhZ2UsICZpb3JwLT52YSk7CisgICAgcmMgPSBw cmVwYXJlX3JpbmdfZm9yX2hlbHBlcihkLCBnZm5feChpb3JwLT5nZm4pLCAmaW9ycC0+cGFnZSwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZpb3JwLT52YSk7CiAKICAgICBpZiAo IHJjICkKICAgICAgICAgaHZtX3VubWFwX2lvcmVxX2dmbihzLCBidWYpOwpAQCAtMzEzLDEwICsz MTMsMTAgQEAgc3RhdGljIHZvaWQgaHZtX3JlbW92ZV9pb3JlcV9nZm4oc3RydWN0IGh2bV9pb3Jl cV9zZXJ2ZXIgKnMsIGJvb2wgYnVmKQogICAgIHN0cnVjdCBkb21haW4gKmQgPSBzLT5kb21haW47 CiAgICAgc3RydWN0IGh2bV9pb3JlcV9wYWdlICppb3JwID0gYnVmID8gJnMtPmJ1ZmlvcmVxIDog JnMtPmlvcmVxOwogCi0gICAgaWYgKCBJU19ERUZBVUxUKHMpIHx8IGlvcnAtPmdmbiA9PSBnZm5f eChJTlZBTElEX0dGTikgKQorICAgIGlmICggSVNfREVGQVVMVChzKSB8fCBnZm5fZXEoaW9ycC0+ Z2ZuLCBJTlZBTElEX0dGTikgKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoIGd1ZXN0X3Bo eXNtYXBfcmVtb3ZlX3BhZ2UoZCwgX2dmbihpb3JwLT5nZm4pLAorICAgIGlmICggZ3Vlc3RfcGh5 c21hcF9yZW1vdmVfcGFnZShkLCBpb3JwLT5nZm4sCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIF9tZm4ocGFnZV90b19tZm4oaW9ycC0+cGFnZSkpLCAwKSApCiAgICAgICAgIGRv bWFpbl9jcmFzaChkKTsKICAgICBjbGVhcl9wYWdlKGlvcnAtPnZhKTsKQEAgLTMyOCwxMiArMzI4 LDEyIEBAIHN0YXRpYyBpbnQgaHZtX2FkZF9pb3JlcV9nZm4oc3RydWN0IGh2bV9pb3JlcV9zZXJ2 ZXIgKnMsIGJvb2wgYnVmKQogICAgIHN0cnVjdCBodm1faW9yZXFfcGFnZSAqaW9ycCA9IGJ1ZiA/ ICZzLT5idWZpb3JlcSA6ICZzLT5pb3JlcTsKICAgICBpbnQgcmM7CiAKLSAgICBpZiAoIElTX0RF RkFVTFQocykgfHwgaW9ycC0+Z2ZuID09IGdmbl94KElOVkFMSURfR0ZOKSApCisgICAgaWYgKCBJ U19ERUZBVUxUKHMpIHx8IGdmbl9lcShpb3JwLT5nZm4sIElOVkFMSURfR0ZOKSApCiAgICAgICAg IHJldHVybiAwOwogCiAgICAgY2xlYXJfcGFnZShpb3JwLT52YSk7CiAKLSAgICByYyA9IGd1ZXN0 X3BoeXNtYXBfYWRkX3BhZ2UoZCwgX2dmbihpb3JwLT5nZm4pLAorICAgIHJjID0gZ3Vlc3RfcGh5 c21hcF9hZGRfcGFnZShkLCBpb3JwLT5nZm4sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIF9tZm4ocGFnZV90b19tZm4oaW9ycC0+cGFnZSkpLCAwKTsKICAgICBpZiAoIHJjID09IDAg KQogICAgICAgICBwYWdpbmdfbWFya19kaXJ0eShkLCBfbWZuKHBhZ2VfdG9fbWZuKGlvcnAtPnBh Z2UpKSk7CkBAIC01OTIsOCArNTkyLDggQEAgc3RhdGljIGludCBodm1faW9yZXFfc2VydmVyX2lu aXQoc3RydWN0IGh2bV9pb3JlcV9zZXJ2ZXIgKnMsCiAgICAgSU5JVF9MSVNUX0hFQUQoJnMtPmlv cmVxX3ZjcHVfbGlzdCk7CiAgICAgc3Bpbl9sb2NrX2luaXQoJnMtPmJ1ZmlvcmVxX2xvY2spOwog Ci0gICAgcy0+aW9yZXEuZ2ZuID0gZ2ZuX3goSU5WQUxJRF9HRk4pOwotICAgIHMtPmJ1ZmlvcmVx LmdmbiA9IGdmbl94KElOVkFMSURfR0ZOKTsKKyAgICBzLT5pb3JlcS5nZm4gPSBJTlZBTElEX0dG TjsKKyAgICBzLT5idWZpb3JlcS5nZm4gPSBJTlZBTElEX0dGTjsKIAogICAgIHJjID0gaHZtX2lv cmVxX3NlcnZlcl9hbGxvY19yYW5nZXNldHMocywgaWQpOwogICAgIGlmICggcmMgKQpAQCAtNzU1 LDExICs3NTUsMTEgQEAgaW50IGh2bV9nZXRfaW9yZXFfc2VydmVyX2luZm8oc3RydWN0IGRvbWFp biAqZCwgaW9zZXJ2aWRfdCBpZCwKICAgICBpZiAoICFzIHx8IElTX0RFRkFVTFQocykgKQogICAg ICAgICBnb3RvIG91dDsKIAotICAgICppb3JlcV9nZm4gPSBzLT5pb3JlcS5nZm47CisgICAgKmlv cmVxX2dmbiA9IGdmbl94KHMtPmlvcmVxLmdmbik7CiAKICAgICBpZiAoIHMtPmJ1ZmlvcmVxLnZh ICE9IE5VTEwgKQogICAgIHsKLSAgICAgICAgKmJ1ZmlvcmVxX2dmbiA9IHMtPmJ1ZmlvcmVxLmdm bjsKKyAgICAgICAgKmJ1ZmlvcmVxX2dmbiA9IGdmbl94KHMtPmJ1ZmlvcmVxLmdmbik7CiAgICAg ICAgICpidWZpb3JlcV9wb3J0ID0gcy0+YnVmaW9yZXFfZXZ0Y2huOwogICAgIH0KIApkaWZmIC0t Z2l0IGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vZG9tYWluLmggYi94ZW4vaW5jbHVkZS9hc20t eDg2L2h2bS9kb21haW4uaAppbmRleCAwMWZlOGE3MmQ4Li4yYmU5MzUzZTM3IDEwMDY0NAotLS0g YS94ZW4vaW5jbHVkZS9hc20teDg2L2h2bS9kb21haW4uaAorKysgYi94ZW4vaW5jbHVkZS9hc20t eDg2L2h2bS9kb21haW4uaApAQCAtMzYsNyArMzYsNyBAQAogI2luY2x1ZGUgPHB1YmxpYy9odm0v ZG1fb3AuaD4KIAogc3RydWN0IGh2bV9pb3JlcV9wYWdlIHsKLSAgICB1bnNpZ25lZCBsb25nIGdm bjsKKyAgICBnZm5fdCBnZm47CiAgICAgc3RydWN0IHBhZ2VfaW5mbyAqcGFnZTsKICAgICB2b2lk ICp2YTsKIH07Ci0tIAoyLjExLjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4u b3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK