From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Durrant Subject: [PATCH v4 10/12] x86/hvm/ioreq: use gfn_t in struct hvm_ioreq_page Date: Tue, 5 Sep 2017 12:37:14 +0100 Message-ID: <20170905113716.3960-11-paul.durrant@citrix.com> References: <20170905113716.3960-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 1dpCJt-0000rn-S8 for xen-devel@lists.xenproject.org; Tue, 05 Sep 2017 11:47:05 +0000 In-Reply-To: <20170905113716.3960-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 b3JlcS5jIGIveGVuL2FyY2gveDg2L2h2bS9pb3JlcS5jCmluZGV4IGRlMDRlYTgxNWIuLjY4NWY2 YTQ4NTggMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9odm0vaW9yZXEuYworKysgYi94ZW4vYXJj aC94ODYvaHZtL2lvcmVxLmMKQEAgLTIwMSw3ICsyMDEsNyBAQCBib29sIGhhbmRsZV9odm1faW9f Y29tcGxldGlvbihzdHJ1Y3QgdmNwdSAqdikKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotc3RhdGlj IHVuc2lnbmVkIGxvbmcgaHZtX2FsbG9jX2lvcmVxX2dmbihzdHJ1Y3QgaHZtX2lvcmVxX3NlcnZl ciAqcykKK3N0YXRpYyBnZm5fdCBodm1fYWxsb2NfaW9yZXFfZ2ZuKHN0cnVjdCBodm1faW9yZXFf c2VydmVyICpzKQogewogICAgIHN0cnVjdCBkb21haW4gKmQgPSBzLT5kb21haW47CiAgICAgdW5z aWduZWQgaW50IGk7CkBAIC0yMTEsMjAgKzIxMSwxOSBAQCBzdGF0aWMgdW5zaWduZWQgbG9uZyBo dm1fYWxsb2NfaW9yZXFfZ2ZuKHN0cnVjdCBodm1faW9yZXFfc2VydmVyICpzKQogICAgIGZvciAo IGkgPSAwOyBpIDwgc2l6ZW9mKGQtPmFyY2guaHZtX2RvbWFpbi5pb3JlcV9nZm4ubWFzaykgKiA4 OyBpKysgKQogICAgIHsKICAgICAgICAgaWYgKCB0ZXN0X2FuZF9jbGVhcl9iaXQoaSwgJmQtPmFy Y2guaHZtX2RvbWFpbi5pb3JlcV9nZm4ubWFzaykgKQotICAgICAgICAgICAgcmV0dXJuIGQtPmFy Y2guaHZtX2RvbWFpbi5pb3JlcV9nZm4uYmFzZSArIGk7CisgICAgICAgICAgICByZXR1cm4gX2dm bihkLT5hcmNoLmh2bV9kb21haW4uaW9yZXFfZ2ZuLmJhc2UgKyBpKTsKICAgICB9CiAKLSAgICBy ZXR1cm4gZ2ZuX3goSU5WQUxJRF9HRk4pOworICAgIHJldHVybiBJTlZBTElEX0dGTjsKIH0KIAot c3RhdGljIHZvaWQgaHZtX2ZyZWVfaW9yZXFfZ2ZuKHN0cnVjdCBodm1faW9yZXFfc2VydmVyICpz LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcgZ2ZuKQorc3Rh dGljIHZvaWQgaHZtX2ZyZWVfaW9yZXFfZ2ZuKHN0cnVjdCBodm1faW9yZXFfc2VydmVyICpzLCBn Zm5fdCBnZm4pCiB7CiAgICAgc3RydWN0IGRvbWFpbiAqZCA9IHMtPmRvbWFpbjsKLSAgICB1bnNp Z25lZCBpbnQgaSA9IGdmbiAtIGQtPmFyY2guaHZtX2RvbWFpbi5pb3JlcV9nZm4uYmFzZTsKKyAg ICB1bnNpZ25lZCBpbnQgaSA9IGdmbl94KGdmbikgLSBkLT5hcmNoLmh2bV9kb21haW4uaW9yZXFf Z2ZuLmJhc2U7CiAKICAgICBBU1NFUlQoIUlTX0RFRkFVTFQocykpOwotICAgIEFTU0VSVChnZm4g IT0gZ2ZuX3goSU5WQUxJRF9HRk4pKTsKKyAgICBBU1NFUlQoIWdmbl9lcShnZm4sIElOVkFMSURf R0ZOKSk7CiAKICAgICBzZXRfYml0KGksICZkLT5hcmNoLmh2bV9kb21haW4uaW9yZXFfZ2ZuLm1h c2spOwogfQpAQCAtMjMzLDcgKzIzMiw3IEBAIHN0YXRpYyB2b2lkIGh2bV91bm1hcF9pb3JlcV9n Zm4oc3RydWN0IGh2bV9pb3JlcV9zZXJ2ZXIgKnMsIGJvb2wgYnVmKQogewogICAgIHN0cnVjdCBo dm1faW9yZXFfcGFnZSAqaW9ycCA9IGJ1ZiA/ICZzLT5idWZpb3JlcSA6ICZzLT5pb3JlcTsKIAot ICAgIGlmICggaW9ycC0+Z2ZuID09IGdmbl94KElOVkFMSURfR0ZOKSApCisgICAgaWYgKCBnZm5f ZXEoaW9ycC0+Z2ZuLCBJTlZBTElEX0dGTikgKQogICAgICAgICByZXR1cm47CiAKICAgICBkZXN0 cm95X3JpbmdfZm9yX2hlbHBlcigmaW9ycC0+dmEsIGlvcnAtPnBhZ2UpOwpAQCAtMjQyLDcgKzI0 MSw3IEBAIHN0YXRpYyB2b2lkIGh2bV91bm1hcF9pb3JlcV9nZm4oc3RydWN0IGh2bV9pb3JlcV9z ZXJ2ZXIgKnMsIGJvb2wgYnVmKQogICAgIGlmICggIUlTX0RFRkFVTFQocykgKQogICAgICAgICBo dm1fZnJlZV9pb3JlcV9nZm4ocywgaW9ycC0+Z2ZuKTsKIAotICAgIGlvcnAtPmdmbiA9IGdmbl94 KElOVkFMSURfR0ZOKTsKKyAgICBpb3JwLT5nZm4gPSBJTlZBTElEX0dGTjsKIH0KIAogc3RhdGlj IGludCBodm1fbWFwX2lvcmVxX2dmbihzdHJ1Y3QgaHZtX2lvcmVxX3NlcnZlciAqcywgYm9vbCBi dWYpCkBAIC0yNTUsMTYgKzI1NCwxNyBAQCBzdGF0aWMgaW50IGh2bV9tYXBfaW9yZXFfZ2ZuKHN0 cnVjdCBodm1faW9yZXFfc2VydmVyICpzLCBib29sIGJ1ZikKICAgICAgICAgcmV0dXJuIC1FSU5W QUw7CiAKICAgICBpZiAoIElTX0RFRkFVTFQocykgKQotICAgICAgICBpb3JwLT5nZm4gPSBidWYg PwotICAgICAgICAgICAgICAgICAgICBkLT5hcmNoLmh2bV9kb21haW4ucGFyYW1zW0hWTV9QQVJB TV9CVUZJT1JFUV9QRk5dIDoKLSAgICAgICAgICAgICAgICAgICAgZC0+YXJjaC5odm1fZG9tYWlu LnBhcmFtc1tIVk1fUEFSQU1fSU9SRVFfUEZOXTsKKyAgICAgICAgaW9ycC0+Z2ZuID0gX2dmbihi dWYgPworICAgICAgICAgICAgICAgICAgICAgICAgIGQtPmFyY2guaHZtX2RvbWFpbi5wYXJhbXNb SFZNX1BBUkFNX0JVRklPUkVRX1BGTl0gOgorICAgICAgICAgICAgICAgICAgICAgICAgIGQtPmFy Y2guaHZtX2RvbWFpbi5wYXJhbXNbSFZNX1BBUkFNX0lPUkVRX1BGTl0pOwogICAgIGVsc2UKICAg ICAgICAgaW9ycC0+Z2ZuID0gaHZtX2FsbG9jX2lvcmVxX2dmbihzKTsKIAotICAgIGlmICggaW9y cC0+Z2ZuID09IGdmbl94KElOVkFMSURfR0ZOKSApCisgICAgaWYgKCBnZm5fZXEoaW9ycC0+Z2Zu LCBJTlZBTElEX0dGTikgKQogICAgICAgICByZXR1cm4gLUVOT01FTTsKIAotICAgIHJjID0gcHJl cGFyZV9yaW5nX2Zvcl9oZWxwZXIoZCwgaW9ycC0+Z2ZuLCAmaW9ycC0+cGFnZSwgJmlvcnAtPnZh KTsKKyAgICByYyA9IHByZXBhcmVfcmluZ19mb3JfaGVscGVyKGQsIGdmbl94KGlvcnAtPmdmbiks ICZpb3JwLT5wYWdlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJmlvcnAtPnZh KTsKIAogICAgIGlmICggcmMgKQogICAgICAgICBodm1fdW5tYXBfaW9yZXFfZ2ZuKHMsIGJ1Zik7 CkBAIC0zMDMsMTAgKzMwMywxMCBAQCBzdGF0aWMgdm9pZCBodm1fcmVtb3ZlX2lvcmVxX2dmbihz dHJ1Y3QgaHZtX2lvcmVxX3NlcnZlciAqcywgYm9vbCBidWYpCiAgICAgc3RydWN0IGRvbWFpbiAq ZCA9IHMtPmRvbWFpbjsKICAgICBzdHJ1Y3QgaHZtX2lvcmVxX3BhZ2UgKmlvcnAgPSBidWYgPyAm cy0+YnVmaW9yZXEgOiAmcy0+aW9yZXE7CiAKLSAgICBpZiAoIElTX0RFRkFVTFQocykgfHwgaW9y cC0+Z2ZuID09IGdmbl94KElOVkFMSURfR0ZOKSApCisgICAgaWYgKCBJU19ERUZBVUxUKHMpIHx8 IGdmbl9lcShpb3JwLT5nZm4sIElOVkFMSURfR0ZOKSApCiAgICAgICAgIHJldHVybjsKIAotICAg IGlmICggZ3Vlc3RfcGh5c21hcF9yZW1vdmVfcGFnZShkLCBfZ2ZuKGlvcnAtPmdmbiksCisgICAg aWYgKCBndWVzdF9waHlzbWFwX3JlbW92ZV9wYWdlKGQsIGlvcnAtPmdmbiwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgX21mbihwYWdlX3RvX21mbihpb3JwLT5wYWdlKSksIDAp ICkKICAgICAgICAgZG9tYWluX2NyYXNoKGQpOwogICAgIGNsZWFyX3BhZ2UoaW9ycC0+dmEpOwpA QCAtMzE4LDEyICszMTgsMTIgQEAgc3RhdGljIGludCBodm1fYWRkX2lvcmVxX2dmbihzdHJ1Y3Qg aHZtX2lvcmVxX3NlcnZlciAqcywgYm9vbCBidWYpCiAgICAgc3RydWN0IGh2bV9pb3JlcV9wYWdl ICppb3JwID0gYnVmID8gJnMtPmJ1ZmlvcmVxIDogJnMtPmlvcmVxOwogICAgIGludCByYzsKIAot ICAgIGlmICggSVNfREVGQVVMVChzKSB8fCBpb3JwLT5nZm4gPT0gZ2ZuX3goSU5WQUxJRF9HRk4p ICkKKyAgICBpZiAoIElTX0RFRkFVTFQocykgfHwgZ2ZuX2VxKGlvcnAtPmdmbiwgSU5WQUxJRF9H Rk4pICkKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICBjbGVhcl9wYWdlKGlvcnAtPnZhKTsKIAot ICAgIHJjID0gZ3Vlc3RfcGh5c21hcF9hZGRfcGFnZShkLCBfZ2ZuKGlvcnAtPmdmbiksCisgICAg cmMgPSBndWVzdF9waHlzbWFwX2FkZF9wYWdlKGQsIGlvcnAtPmdmbiwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgX21mbihwYWdlX3RvX21mbihpb3JwLT5wYWdlKSksIDApOwogICAg IGlmICggcmMgPT0gMCApCiAgICAgICAgIHBhZ2luZ19tYXJrX2RpcnR5KGQsIF9tZm4ocGFnZV90 b19tZm4oaW9ycC0+cGFnZSkpKTsKQEAgLTU4Miw4ICs1ODIsOCBAQCBzdGF0aWMgaW50IGh2bV9p b3JlcV9zZXJ2ZXJfaW5pdChzdHJ1Y3QgaHZtX2lvcmVxX3NlcnZlciAqcywKICAgICBJTklUX0xJ U1RfSEVBRCgmcy0+aW9yZXFfdmNwdV9saXN0KTsKICAgICBzcGluX2xvY2tfaW5pdCgmcy0+YnVm aW9yZXFfbG9jayk7CiAKLSAgICBzLT5pb3JlcS5nZm4gPSBnZm5feChJTlZBTElEX0dGTik7Ci0g ICAgcy0+YnVmaW9yZXEuZ2ZuID0gZ2ZuX3goSU5WQUxJRF9HRk4pOworICAgIHMtPmlvcmVxLmdm biA9IElOVkFMSURfR0ZOOworICAgIHMtPmJ1ZmlvcmVxLmdmbiA9IElOVkFMSURfR0ZOOwogCiAg ICAgcmMgPSBodm1faW9yZXFfc2VydmVyX2FsbG9jX3Jhbmdlc2V0cyhzLCBpZCk7CiAgICAgaWYg KCByYyApCkBAIC03NDUsMTEgKzc0NSwxMSBAQCBpbnQgaHZtX2dldF9pb3JlcV9zZXJ2ZXJfaW5m byhzdHJ1Y3QgZG9tYWluICpkLCBpb3NlcnZpZF90IGlkLAogICAgIGlmICggIXMgfHwgSVNfREVG QVVMVChzKSApCiAgICAgICAgIGdvdG8gb3V0OwogCi0gICAgKmlvcmVxX2dmbiA9IHMtPmlvcmVx LmdmbjsKKyAgICAqaW9yZXFfZ2ZuID0gZ2ZuX3gocy0+aW9yZXEuZ2ZuKTsKIAogICAgIGlmICgg cy0+YnVmaW9yZXEudmEgIT0gTlVMTCApCiAgICAgewotICAgICAgICAqYnVmaW9yZXFfZ2ZuID0g cy0+YnVmaW9yZXEuZ2ZuOworICAgICAgICAqYnVmaW9yZXFfZ2ZuID0gZ2ZuX3gocy0+YnVmaW9y ZXEuZ2ZuKTsKICAgICAgICAgKmJ1ZmlvcmVxX3BvcnQgPSBzLT5idWZpb3JlcV9ldnRjaG47CiAg ICAgfQogCmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9hc20teDg2L2h2bS9kb21haW4uaCBiL3hl bi9pbmNsdWRlL2FzbS14ODYvaHZtL2RvbWFpbi5oCmluZGV4IDAxZmU4YTcyZDguLjJiZTkzNTNl MzcgMTAwNjQ0Ci0tLSBhL3hlbi9pbmNsdWRlL2FzbS14ODYvaHZtL2RvbWFpbi5oCisrKyBiL3hl bi9pbmNsdWRlL2FzbS14ODYvaHZtL2RvbWFpbi5oCkBAIC0zNiw3ICszNiw3IEBACiAjaW5jbHVk ZSA8cHVibGljL2h2bS9kbV9vcC5oPgogCiBzdHJ1Y3QgaHZtX2lvcmVxX3BhZ2UgewotICAgIHVu c2lnbmVkIGxvbmcgZ2ZuOworICAgIGdmbl90IGdmbjsKICAgICBzdHJ1Y3QgcGFnZV9pbmZvICpw YWdlOwogICAgIHZvaWQgKnZhOwogfTsKLS0gCjIuMTEuMAoKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRl dmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=