From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Durrant Subject: [PATCH v3 10/12] x86/hvm/ioreq: use gfn_t in struct hvm_ioreq_page Date: Thu, 31 Aug 2017 10:36:03 +0100 Message-ID: <20170831093605.2757-11-paul.durrant@citrix.com> References: <20170831093605.2757-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 1dnM3W-0000GD-0t for xen-devel@lists.xenproject.org; Thu, 31 Aug 2017 09:46:34 +0000 In-Reply-To: <20170831093605.2757-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+Ci0tLQpDYzogQW5k cmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4KQ2M6IEphbiBCZXVsaWNoIDxq YmV1bGljaEBzdXNlLmNvbT4KLS0tCiB4ZW4vYXJjaC94ODYvaHZtL2lvcmVxLmMgICAgICAgICB8 IDQ0ICsrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0KIHhlbi9pbmNsdWRl L2FzbS14ODYvaHZtL2RvbWFpbi5oIHwgIDIgKy0KIDIgZmlsZXMgY2hhbmdlZCwgMjMgaW5zZXJ0 aW9ucygrKSwgMjMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L2h2bS9p b3JlcS5jIGIveGVuL2FyY2gveDg2L2h2bS9pb3JlcS5jCmluZGV4IGZhYzgyYWU5MzQuLjQ4YzUy MzgyNWUgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9odm0vaW9yZXEuYworKysgYi94ZW4vYXJj aC94ODYvaHZtL2lvcmVxLmMKQEAgLTE5Miw3ICsxOTIsNyBAQCBib29sIGhhbmRsZV9odm1faW9f Y29tcGxldGlvbihzdHJ1Y3QgdmNwdSAqdikKICNkZWZpbmUgSVNfREVGQVVMVChzKSBcCiAgICAg KHMgPT0gcy0+ZG9tYWluLT5hcmNoLmh2bV9kb21haW4uaW9yZXFfc2VydmVyLnNlcnZlcltERUZB VUxUX0lPU0VSVklEXSkKIAotc3RhdGljIHVuc2lnbmVkIGxvbmcgaHZtX2FsbG9jX2lvcmVxX2dm bihzdHJ1Y3QgaHZtX2lvcmVxX3NlcnZlciAqcykKK3N0YXRpYyBnZm5fdCBodm1fYWxsb2NfaW9y ZXFfZ2ZuKHN0cnVjdCBodm1faW9yZXFfc2VydmVyICpzKQogewogICAgIHN0cnVjdCBkb21haW4g KmQgPSBzLT5kb21haW47CiAgICAgdW5zaWduZWQgaW50IGk7CkBAIC0yMDIsMjAgKzIwMiwxOSBA QCBzdGF0aWMgdW5zaWduZWQgbG9uZyBodm1fYWxsb2NfaW9yZXFfZ2ZuKHN0cnVjdCBodm1faW9y ZXFfc2VydmVyICpzKQogICAgIGZvciAoIGkgPSAwOyBpIDwgc2l6ZW9mKGQtPmFyY2guaHZtX2Rv bWFpbi5pb3JlcV9nZm4ubWFzaykgKiA4OyBpKysgKQogICAgIHsKICAgICAgICAgaWYgKCB0ZXN0 X2FuZF9jbGVhcl9iaXQoaSwgJmQtPmFyY2guaHZtX2RvbWFpbi5pb3JlcV9nZm4ubWFzaykgKQot ICAgICAgICAgICAgcmV0dXJuIGQtPmFyY2guaHZtX2RvbWFpbi5pb3JlcV9nZm4uYmFzZSArIGk7 CisgICAgICAgICAgICByZXR1cm4gX2dmbihkLT5hcmNoLmh2bV9kb21haW4uaW9yZXFfZ2ZuLmJh c2UgKyBpKTsKICAgICB9CiAKLSAgICByZXR1cm4gZ2ZuX3goSU5WQUxJRF9HRk4pOworICAgIHJl dHVybiBJTlZBTElEX0dGTjsKIH0KIAotc3RhdGljIHZvaWQgaHZtX2ZyZWVfaW9yZXFfZ2ZuKHN0 cnVjdCBodm1faW9yZXFfc2VydmVyICpzLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHVuc2lnbmVkIGxvbmcgZ2ZuKQorc3RhdGljIHZvaWQgaHZtX2ZyZWVfaW9yZXFfZ2ZuKHN0cnVj dCBodm1faW9yZXFfc2VydmVyICpzLCBnZm5fdCBnZm4pCiB7CiAgICAgc3RydWN0IGRvbWFpbiAq ZCA9IHMtPmRvbWFpbjsKLSAgICB1bnNpZ25lZCBpbnQgaSA9IGdmbiAtIGQtPmFyY2guaHZtX2Rv bWFpbi5pb3JlcV9nZm4uYmFzZTsKKyAgICB1bnNpZ25lZCBpbnQgaSA9IGdmbl94KGdmbikgLSBk LT5hcmNoLmh2bV9kb21haW4uaW9yZXFfZ2ZuLmJhc2U7CiAKICAgICBBU1NFUlQoIUlTX0RFRkFV TFQocykpOwotICAgIEFTU0VSVChnZm4gIT0gZ2ZuX3goSU5WQUxJRF9HRk4pKTsKKyAgICBBU1NF UlQoIWdmbl9lcShnZm4sIElOVkFMSURfR0ZOKSk7CiAKICAgICBzZXRfYml0KGksICZkLT5hcmNo Lmh2bV9kb21haW4uaW9yZXFfZ2ZuLm1hc2spOwogfQpAQCAtMjI0LDcgKzIyMyw3IEBAIHN0YXRp YyB2b2lkIGh2bV91bm1hcF9pb3JlcV9nZm4oc3RydWN0IGh2bV9pb3JlcV9zZXJ2ZXIgKnMsIGJv b2wgYnVmKQogewogICAgIHN0cnVjdCBodm1faW9yZXFfcGFnZSAqaW9ycCA9IGJ1ZiA/ICZzLT5i dWZpb3JlcSA6ICZzLT5pb3JlcTsKIAotICAgIGlmICggaW9ycC0+Z2ZuID09IGdmbl94KElOVkFM SURfR0ZOKSApCisgICAgaWYgKCBnZm5fZXEoaW9ycC0+Z2ZuLCBJTlZBTElEX0dGTikgKQogICAg ICAgICByZXR1cm47CiAKICAgICBkZXN0cm95X3JpbmdfZm9yX2hlbHBlcigmaW9ycC0+dmEsIGlv cnAtPnBhZ2UpOwpAQCAtMjMzLDcgKzIzMiw3IEBAIHN0YXRpYyB2b2lkIGh2bV91bm1hcF9pb3Jl cV9nZm4oc3RydWN0IGh2bV9pb3JlcV9zZXJ2ZXIgKnMsIGJvb2wgYnVmKQogICAgIGlmICggIUlT X0RFRkFVTFQocykgKQogICAgICAgICBodm1fZnJlZV9pb3JlcV9nZm4ocywgaW9ycC0+Z2ZuKTsK IAotICAgIGlvcnAtPmdmbiA9IGdmbl94KElOVkFMSURfR0ZOKTsKKyAgICBpb3JwLT5nZm4gPSBJ TlZBTElEX0dGTjsKIH0KIAogc3RhdGljIGludCBodm1fbWFwX2lvcmVxX2dmbihzdHJ1Y3QgaHZt X2lvcmVxX3NlcnZlciAqcywgYm9vbCBidWYpCkBAIC0yNDYsMTYgKzI0NSwxNyBAQCBzdGF0aWMg aW50IGh2bV9tYXBfaW9yZXFfZ2ZuKHN0cnVjdCBodm1faW9yZXFfc2VydmVyICpzLCBib29sIGJ1 ZikKICAgICAgICAgcmV0dXJuIC1FSU5WQUw7CiAKICAgICBpZiAoIElTX0RFRkFVTFQocykgKQot ICAgICAgICBpb3JwLT5nZm4gPSBidWYgPwotICAgICAgICAgICAgICAgICAgICBkLT5hcmNoLmh2 bV9kb21haW4ucGFyYW1zW0hWTV9QQVJBTV9CVUZJT1JFUV9QRk5dIDoKLSAgICAgICAgICAgICAg ICAgICAgZC0+YXJjaC5odm1fZG9tYWluLnBhcmFtc1tIVk1fUEFSQU1fSU9SRVFfUEZOXTsKKyAg ICAgICAgaW9ycC0+Z2ZuID0gX2dmbihidWYgPworICAgICAgICAgICAgICAgICAgICAgICAgIGQt PmFyY2guaHZtX2RvbWFpbi5wYXJhbXNbSFZNX1BBUkFNX0JVRklPUkVRX1BGTl0gOgorICAgICAg ICAgICAgICAgICAgICAgICAgIGQtPmFyY2guaHZtX2RvbWFpbi5wYXJhbXNbSFZNX1BBUkFNX0lP UkVRX1BGTl0pOwogICAgIGVsc2UKICAgICAgICAgaW9ycC0+Z2ZuID0gaHZtX2FsbG9jX2lvcmVx X2dmbihzKTsKIAotICAgIGlmICggaW9ycC0+Z2ZuID09IGdmbl94KElOVkFMSURfR0ZOKSApCisg ICAgaWYgKCBnZm5fZXEoaW9ycC0+Z2ZuLCBJTlZBTElEX0dGTikgKQogICAgICAgICByZXR1cm4g LUVOT01FTTsKIAotICAgIHJjID0gcHJlcGFyZV9yaW5nX2Zvcl9oZWxwZXIoZCwgaW9ycC0+Z2Zu LCAmaW9ycC0+cGFnZSwgJmlvcnAtPnZhKTsKKyAgICByYyA9IHByZXBhcmVfcmluZ19mb3JfaGVs cGVyKGQsIGdmbl94KGlvcnAtPmdmbiksICZpb3JwLT5wYWdlLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgJmlvcnAtPnZhKTsKIAogICAgIGlmICggcmMgKQogICAgICAgICBodm1f dW5tYXBfaW9yZXFfZ2ZuKHMsIGJ1Zik7CkBAIC0yOTcsMTAgKzI5NywxMCBAQCBzdGF0aWMgdm9p ZCBodm1fcmVtb3ZlX2lvcmVxX2dmbihzdHJ1Y3QgaHZtX2lvcmVxX3NlcnZlciAqcywgYm9vbCBi dWYpCiAgICAgc3RydWN0IGRvbWFpbiAqZCA9IHMtPmRvbWFpbjsKICAgICBzdHJ1Y3QgaHZtX2lv cmVxX3BhZ2UgKmlvcnAgPSBidWYgPyAmcy0+YnVmaW9yZXEgOiAmcy0+aW9yZXE7CiAKLSAgICBp ZiAoIElTX0RFRkFVTFQocykgfHwgaW9ycC0+Z2ZuID09IGdmbl94KElOVkFMSURfR0ZOKSApCisg ICAgaWYgKCBJU19ERUZBVUxUKHMpIHx8IGdmbl9lcShpb3JwLT5nZm4sIElOVkFMSURfR0ZOKSAp CiAgICAgICAgIHJldHVybjsKIAotICAgIGlmICggZ3Vlc3RfcGh5c21hcF9yZW1vdmVfcGFnZShk LCBfZ2ZuKGlvcnAtPmdmbiksCisgICAgaWYgKCBndWVzdF9waHlzbWFwX3JlbW92ZV9wYWdlKGQs IGlvcnAtPmdmbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgX21mbihwYWdl X3RvX21mbihpb3JwLT5wYWdlKSksIDApICkKICAgICAgICAgZG9tYWluX2NyYXNoKGQpOwogICAg IGNsZWFyX3BhZ2UoaW9ycC0+dmEpOwpAQCAtMzEyLDEyICszMTIsMTIgQEAgc3RhdGljIGludCBo dm1fYWRkX2lvcmVxX2dmbihzdHJ1Y3QgaHZtX2lvcmVxX3NlcnZlciAqcywgYm9vbCBidWYpCiAg ICAgc3RydWN0IGh2bV9pb3JlcV9wYWdlICppb3JwID0gYnVmID8gJnMtPmJ1ZmlvcmVxIDogJnMt PmlvcmVxOwogICAgIGludCByYzsKIAotICAgIGlmICggSVNfREVGQVVMVChzKSB8fCBpb3JwLT5n Zm4gPT0gZ2ZuX3goSU5WQUxJRF9HRk4pICkKKyAgICBpZiAoIElTX0RFRkFVTFQocykgfHwgZ2Zu X2VxKGlvcnAtPmdmbiwgSU5WQUxJRF9HRk4pICkKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICBj bGVhcl9wYWdlKGlvcnAtPnZhKTsKIAotICAgIHJjID0gZ3Vlc3RfcGh5c21hcF9hZGRfcGFnZShk LCBfZ2ZuKGlvcnAtPmdmbiksCisgICAgcmMgPSBndWVzdF9waHlzbWFwX2FkZF9wYWdlKGQsIGlv cnAtPmdmbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgX21mbihwYWdlX3RvX21m bihpb3JwLT5wYWdlKSksIDApOwogICAgIGlmICggcmMgPT0gMCApCiAgICAgICAgIHBhZ2luZ19t YXJrX2RpcnR5KGQsIF9tZm4ocGFnZV90b19tZm4oaW9ycC0+cGFnZSkpKTsKQEAgLTU3Niw4ICs1 NzYsOCBAQCBzdGF0aWMgaW50IGh2bV9pb3JlcV9zZXJ2ZXJfaW5pdChzdHJ1Y3QgaHZtX2lvcmVx X3NlcnZlciAqcywKICAgICBJTklUX0xJU1RfSEVBRCgmcy0+aW9yZXFfdmNwdV9saXN0KTsKICAg ICBzcGluX2xvY2tfaW5pdCgmcy0+YnVmaW9yZXFfbG9jayk7CiAKLSAgICBzLT5pb3JlcS5nZm4g PSBnZm5feChJTlZBTElEX0dGTik7Ci0gICAgcy0+YnVmaW9yZXEuZ2ZuID0gZ2ZuX3goSU5WQUxJ RF9HRk4pOworICAgIHMtPmlvcmVxLmdmbiA9IElOVkFMSURfR0ZOOworICAgIHMtPmJ1ZmlvcmVx LmdmbiA9IElOVkFMSURfR0ZOOwogCiAgICAgcmMgPSBodm1faW9yZXFfc2VydmVyX2FsbG9jX3Jh bmdlc2V0cyhzLCBpZCk7CiAgICAgaWYgKCByYyApCkBAIC03MzgsMTEgKzczOCwxMSBAQCBpbnQg aHZtX2dldF9pb3JlcV9zZXJ2ZXJfaW5mbyhzdHJ1Y3QgZG9tYWluICpkLCBpb3NlcnZpZF90IGlk LAogICAgIGlmICggaWQgPj0gTUFYX05SX0lPUkVRX1NFUlZFUlMgfHwgIXMgfHwgSVNfREVGQVVM VChzKSApCiAgICAgICAgIGdvdG8gb3V0OwogCi0gICAgKmlvcmVxX2dmbiA9IHMtPmlvcmVxLmdm bjsKKyAgICAqaW9yZXFfZ2ZuID0gZ2ZuX3gocy0+aW9yZXEuZ2ZuKTsKIAogICAgIGlmICggcy0+ YnVmaW9yZXEudmEgIT0gTlVMTCApCiAgICAgewotICAgICAgICAqYnVmaW9yZXFfZ2ZuID0gcy0+ YnVmaW9yZXEuZ2ZuOworICAgICAgICAqYnVmaW9yZXFfZ2ZuID0gZ2ZuX3gocy0+YnVmaW9yZXEu Z2ZuKTsKICAgICAgICAgKmJ1ZmlvcmVxX3BvcnQgPSBzLT5idWZpb3JlcV9ldnRjaG47CiAgICAg fQogCmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9hc20teDg2L2h2bS9kb21haW4uaCBiL3hlbi9p bmNsdWRlL2FzbS14ODYvaHZtL2RvbWFpbi5oCmluZGV4IDAxZmU4YTcyZDguLjJiZTkzNTNlMzcg MTAwNjQ0Ci0tLSBhL3hlbi9pbmNsdWRlL2FzbS14ODYvaHZtL2RvbWFpbi5oCisrKyBiL3hlbi9p bmNsdWRlL2FzbS14ODYvaHZtL2RvbWFpbi5oCkBAIC0zNiw3ICszNiw3IEBACiAjaW5jbHVkZSA8 cHVibGljL2h2bS9kbV9vcC5oPgogCiBzdHJ1Y3QgaHZtX2lvcmVxX3BhZ2UgewotICAgIHVuc2ln bmVkIGxvbmcgZ2ZuOworICAgIGdmbl90IGdmbjsKICAgICBzdHJ1Y3QgcGFnZV9pbmZvICpwYWdl OwogICAgIHZvaWQgKnZhOwogfTsKLS0gCjIuMTEuMAoKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVs QGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=