From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: [PATCH v2 4/9] xen/x86: Use maddr_to_page and maddr_to_mfn to avoid open-coded >> PAGE_SHIFT Date: Thu, 5 Oct 2017 18:42:17 +0100 Message-ID: <20171005174222.29161-5-julien.grall@linaro.org> References: <20171005174222.29161-1-julien.grall@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171005174222.29161-1-julien.grall@linaro.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xen.org Cc: Elena Ufimtseva , George Dunlap , Andrew Cooper , Julien Grall , Tim Deegan , Jan Beulich List-Id: xen-devel@lists.xenproject.org VGhlIGNvbnN0cnVjdGlvbnMgX21mbiguLi4gPiBQQUdFX1NISUZUKSBhbmQgbWZuX3RvX3BhZ2Uo Li4uID4+IFBBR0VfU0hJRlQpCmNvdWxkIHJlc3BlY3RpdmVseSBiZSByZXBsYWNlZCBieSBtYWRk cl90b19tZm4oLi4uKSBhbmQKbWFkZHJfdG9fcGFnZSguLi4pLgoKU2lnbmVkLW9mZi1ieTogSnVs aWVuIEdyYWxsIDxqdWxpZW4uZ3JhbGxAbGluYXJvLm9yZz4KUmV2aWV3ZWQtYnk6IEFuZHJldyBD b29wZXIgPGFuZHJldy5jb29wZXIzQGNpdHJpeC5jb20+CgotLS0KCkNjOiBFbGVuYSBVZmltdHNl dmEgPGVsZW5hLnVmaW10c2V2YUBvcmFjbGUuY29tPgpDYzogSmFuIEJldWxpY2ggPGpiZXVsaWNo QHN1c2UuY29tPgpDYzogQW5kcmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4K Q2M6IFRpbSBEZWVnYW4gPHRpbUB4ZW4ub3JnPgpDYzogR2VvcmdlIER1bmxhcCA8Z2VvcmdlLmR1 bmxhcEBldS5jaXRyaXguY29tPgoKICAgIENoYW5nZXMgaW4gdjI6CiAgICAgICAgLSBBZGQgQW5k cmV3J3MgcmV2aWV3ZWQtYnkKLS0tCiB4ZW4vYXJjaC94ODYvZGVidWcuYyAgICAgICAgICAgIHwg MiArLQogeGVuL2FyY2gveDg2L21tL3NoYWRvdy9jb21tb24uYyB8IDIgKy0KIHhlbi9hcmNoL3g4 Ni9tbS9zaGFkb3cvbXVsdGkuYyAgfCA2ICsrKy0tLQogeGVuL2NvbW1vbi9raW1hZ2UuYyAgICAg ICAgICAgICB8IDYgKysrLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDggaW5zZXJ0aW9ucygrKSwgOCBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvZGVidWcuYyBiL3hlbi9hcmNo L3g4Ni9kZWJ1Zy5jCmluZGV4IDFjMTBiODRhMTYuLjkxNTlmMzJkYjQgMTAwNjQ0Ci0tLSBhL3hl bi9hcmNoL3g4Ni9kZWJ1Zy5jCisrKyBiL3hlbi9hcmNoL3g4Ni9kZWJ1Zy5jCkBAIC05OCw3ICs5 OCw3IEBAIGRiZ19wdl92YTJtZm4oZGJndmFfdCB2YWRkciwgc3RydWN0IGRvbWFpbiAqZHAsIHVp bnQ2NF90IHBnZDN2YWwpCiAgICAgbDJfcGdlbnRyeV90IGwyZSwgKmwydDsKICAgICBsMV9wZ2Vu dHJ5X3QgbDFlLCAqbDF0OwogICAgIHVuc2lnbmVkIGxvbmcgY3IzID0gKHBnZDN2YWwgPyBwZ2Qz dmFsIDogZHAtPnZjcHVbMF0tPmFyY2guY3IzKTsKLSAgICBtZm5fdCBtZm4gPSBfbWZuKGNyMyA+ PiBQQUdFX1NISUZUKTsKKyAgICBtZm5fdCBtZm4gPSBtYWRkcl90b19tZm4oY3IzKTsKIAogICAg IERCR1AyKCJ2YWRkcjolbHggZG9taWQ6JWQgY3IzOiVseCBwZ2QzOiVseFxuIiwgdmFkZHIsIGRw LT5kb21haW5faWQsIAogICAgICAgICAgIGNyMywgcGdkM3ZhbCk7CmRpZmYgLS1naXQgYS94ZW4v YXJjaC94ODYvbW0vc2hhZG93L2NvbW1vbi5jIGIveGVuL2FyY2gveDg2L21tL3NoYWRvdy9jb21t b24uYwppbmRleCA4NjE4NmNjY2RmLi5mNjVkMmE2NTIzIDEwMDY0NAotLS0gYS94ZW4vYXJjaC94 ODYvbW0vc2hhZG93L2NvbW1vbi5jCisrKyBiL3hlbi9hcmNoL3g4Ni9tbS9zaGFkb3cvY29tbW9u LmMKQEAgLTI2NDAsNyArMjY0MCw3IEBAIHN0YXRpYyBpbnQgc2hfcmVtb3ZlX3NoYWRvd192aWFf cG9pbnRlcihzdHJ1Y3QgZG9tYWluICpkLCBtZm5fdCBzbWZuKQogICAgIEFTU0VSVChzaF90eXBl X2hhc191cF9wb2ludGVyKGQsIHNwLT51LnNoLnR5cGUpKTsKIAogICAgIGlmIChzcC0+dXAgPT0g MCkgcmV0dXJuIDA7Ci0gICAgcG1mbiA9IF9tZm4oc3AtPnVwID4+IFBBR0VfU0hJRlQpOworICAg IHBtZm4gPSBtYWRkcl90b19tZm4oc3AtPnVwKTsKICAgICBBU1NFUlQobWZuX3ZhbGlkKHBtZm4p KTsKICAgICB2YWRkciA9IG1hcF9kb21haW5fcGFnZShwbWZuKTsKICAgICBBU1NFUlQodmFkZHIp OwpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21tL3NoYWRvdy9tdWx0aS5jIGIveGVuL2FyY2gv eDg2L21tL3NoYWRvdy9tdWx0aS5jCmluZGV4IDI4MDMwYWNiZjYuLjFlNDJlMWQ4YWIgMTAwNjQ0 Ci0tLSBhL3hlbi9hcmNoL3g4Ni9tbS9zaGFkb3cvbXVsdGkuYworKysgYi94ZW4vYXJjaC94ODYv bW0vc2hhZG93L211bHRpLmMKQEAgLTI0MjUsNyArMjQyNSw3IEBAIGludCBzaF9zYWZlX25vdF90 b19zeW5jKHN0cnVjdCB2Y3B1ICp2LCBtZm5fdCBnbDFtZm4pCiAgICAgc3AgPSBtZm5fdG9fcGFn ZShzbWZuKTsKICAgICBpZiAoIHNwLT51LnNoLmNvdW50ICE9IDEgfHwgIXNwLT51cCApCiAgICAg ICAgIHJldHVybiAwOwotICAgIHNtZm4gPSBfbWZuKHNwLT51cCA+PiBQQUdFX1NISUZUKTsKKyAg ICBzbWZuID0gbWFkZHJfdG9fbWZuKHNwLT51cCk7CiAgICAgQVNTRVJUKG1mbl92YWxpZChzbWZu KSk7CiAKICNpZiAoU0hBRE9XX1BBR0lOR19MRVZFTFMgPT0gNCkKQEAgLTI0MzQsNyArMjQzNCw3 IEBAIGludCBzaF9zYWZlX25vdF90b19zeW5jKHN0cnVjdCB2Y3B1ICp2LCBtZm5fdCBnbDFtZm4p CiAgICAgQVNTRVJUKHNoX3R5cGVfaGFzX3VwX3BvaW50ZXIoZCwgU0hfdHlwZV9sMl9zaGFkb3cp KTsKICAgICBpZiAoIHNwLT51LnNoLmNvdW50ICE9IDEgfHwgIXNwLT51cCApCiAgICAgICAgIHJl dHVybiAwOwotICAgIHNtZm4gPSBfbWZuKHNwLT51cCA+PiBQQUdFX1NISUZUKTsKKyAgICBzbWZu ID0gbWFkZHJfdG9fbWZuKHNwLT51cCk7CiAgICAgQVNTRVJUKG1mbl92YWxpZChzbWZuKSk7CiAK ICAgICAvKiB1cCB0byBsNCAqLwpAQCAtMjQ0Miw3ICsyNDQyLDcgQEAgaW50IHNoX3NhZmVfbm90 X3RvX3N5bmMoc3RydWN0IHZjcHUgKnYsIG1mbl90IGdsMW1mbikKICAgICBpZiAoIHNwLT51LnNo LmNvdW50ICE9IDEKICAgICAgICAgIHx8ICFzaF90eXBlX2hhc191cF9wb2ludGVyKGQsIFNIX3R5 cGVfbDNfNjRfc2hhZG93KSB8fCAhc3AtPnVwICkKICAgICAgICAgcmV0dXJuIDA7Ci0gICAgc21m biA9IF9tZm4oc3AtPnVwID4+IFBBR0VfU0hJRlQpOworICAgIHNtZm4gPSBtYWRkcl90b19tZm4o c3AtPnVwKTsKICAgICBBU1NFUlQobWZuX3ZhbGlkKHNtZm4pKTsKICNlbmRpZgogCmRpZmYgLS1n aXQgYS94ZW4vY29tbW9uL2tpbWFnZS5jIGIveGVuL2NvbW1vbi9raW1hZ2UuYwppbmRleCBjZjYy NGQxMGZkLi5lYmM3MWFmZmQxIDEwMDY0NAotLS0gYS94ZW4vY29tbW9uL2tpbWFnZS5jCisrKyBi L3hlbi9jb21tb24va2ltYWdlLmMKQEAgLTUwNCw3ICs1MDQsNyBAQCBzdGF0aWMgdm9pZCBraW1h Z2VfZnJlZV9lbnRyeShraW1hZ2VfZW50cnlfdCBlbnRyeSkKIHsKICAgICBzdHJ1Y3QgcGFnZV9p bmZvICpwYWdlOwogCi0gICAgcGFnZSA9IG1mbl90b19wYWdlKGVudHJ5ID4+IFBBR0VfU0hJRlQp OworICAgIHBhZ2UgPSBtYWRkcl90b19wYWdlKGVudHJ5KTsKICAgICBmcmVlX2RvbWhlYXBfcGFn ZShwYWdlKTsKIH0KIApAQCAtNjM2LDggKzYzNiw4IEBAIHN0YXRpYyBzdHJ1Y3QgcGFnZV9pbmZv ICpraW1hZ2VfYWxsb2NfcGFnZShzdHJ1Y3Qga2V4ZWNfaW1hZ2UgKmltYWdlLAogICAgICAgICBp ZiAoIG9sZCApCiAgICAgICAgIHsKICAgICAgICAgICAgIC8qIElmIHNvIG1vdmUgaXQuICovCi0g ICAgICAgICAgICBtZm5fdCBvbGRfbWZuID0gX21mbigqb2xkID4+IFBBR0VfU0hJRlQpOwotICAg ICAgICAgICAgbWZuX3QgbWZuID0gX21mbihhZGRyID4+IFBBR0VfU0hJRlQpOworICAgICAgICAg ICAgbWZuX3Qgb2xkX21mbiA9IG1hZGRyX3RvX21mbigqb2xkKTsKKyAgICAgICAgICAgIG1mbl90 IG1mbiA9IG1hZGRyX3RvX21mbihhZGRyKTsKIAogICAgICAgICAgICAgY29weV9kb21haW5fcGFn ZShtZm4sIG9sZF9tZm4pOwogICAgICAgICAgICAgY2xlYXJfZG9tYWluX3BhZ2Uob2xkX21mbik7 Ci0tIAoyLjExLjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBz Oi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK