From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH] x86: Make use of pagetable_get_mfn() where appropriate Date: Thu, 28 Sep 2017 19:36:40 +0100 Message-ID: <1506623800-15662-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Xen-devel Cc: George Dunlap , Andrew Cooper , Tim Deegan , Jan Beulich List-Id: xen-devel@lists.xenproject.org Li4uIGluc3RlYWQgb2YgdGhlIG9wZW5jb2RlZCBfbWZuKHBhZ2V0YWJsZV9nZXRfcGZuKC4uLikp IGNvbnN0cnVjdC4KCkZpeCB0d28gb3Zlcmx5IGxvbmcgbGluZXM7IG5vIGZ1bmN0aW9uYWwgY2hh bmdlLgoKU2lnbmVkLW9mZi1ieTogQW5kcmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4 LmNvbT4KLS0tCkNDOiBKYW4gQmV1bGljaCA8SkJldWxpY2hAc3VzZS5jb20+CkNDOiBUaW0gRGVl Z2FuIDx0aW1AeGVuLm9yZz4KQ0M6IEdlb3JnZSBEdW5sYXAgPGdlb3JnZS5kdW5sYXBAZXUuY2l0 cml4LmNvbT4KLS0tCiB4ZW4vYXJjaC94ODYvZG9tYWluLmMgICAgICAgICAgfCAgMiArLQogeGVu L2FyY2gveDg2L2RvbWN0bC5jICAgICAgICAgIHwgIDIgKy0KIHhlbi9hcmNoL3g4Ni9tbS9wMm0t ZXB0LmMgICAgICB8IDEyICsrKysrKystLS0tLQogeGVuL2FyY2gveDg2L21tL3NoYWRvdy9tdWx0 aS5jIHwgIDUgKysrLS0KIDQgZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgOSBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvZG9tYWluLmMgYi94ZW4vYXJjaC94 ODYvZG9tYWluLmMKaW5kZXggNDY2YTFhMi4uYzM5OWIzZSAxMDA2NDQKLS0tIGEveGVuL2FyY2gv eDg2L2RvbWFpbi5jCisrKyBiL3hlbi9hcmNoL3g4Ni9kb21haW4uYwpAQCAtMTExMyw3ICsxMTEz LDcgQEAgaW50IGFyY2hfc2V0X2luZm9fZ3Vlc3QoCiAgICAgewogICAgICAgICBsNF9wZ2VudHJ5 X3QgKmw0dGFiOwogCi0gICAgICAgIGw0dGFiID0gbWFwX2RvbWFpbl9wYWdlKF9tZm4ocGFnZXRh YmxlX2dldF9wZm4odi0+YXJjaC5ndWVzdF90YWJsZSkpKTsKKyAgICAgICAgbDR0YWIgPSBtYXBf ZG9tYWluX3BhZ2UocGFnZXRhYmxlX2dldF9tZm4odi0+YXJjaC5ndWVzdF90YWJsZSkpOwogICAg ICAgICAqbDR0YWIgPSBsNGVfZnJvbV9wZm4ocGFnZV90b19tZm4oY3IzX3BhZ2UpLAogICAgICAg ICAgICAgX1BBR0VfUFJFU0VOVHxfUEFHRV9SV3xfUEFHRV9VU0VSfF9QQUdFX0FDQ0VTU0VEKTsK ICAgICAgICAgdW5tYXBfZG9tYWluX3BhZ2UobDR0YWIpOwpkaWZmIC0tZ2l0IGEveGVuL2FyY2gv eDg2L2RvbWN0bC5jIGIveGVuL2FyY2gveDg2L2RvbWN0bC5jCmluZGV4IDU0MGJhMDguLmRmZGEy NzQgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9kb21jdGwuYworKysgYi94ZW4vYXJjaC94ODYv ZG9tY3RsLmMKQEAgLTE2NDAsNyArMTY0MCw3IEBAIHZvaWQgYXJjaF9nZXRfaW5mb19ndWVzdChz dHJ1Y3QgdmNwdSAqdiwgdmNwdV9ndWVzdF9jb250ZXh0X3UgYykKICAgICAgICAgZWxzZQogICAg ICAgICB7CiAgICAgICAgICAgICBjb25zdCBsNF9wZ2VudHJ5X3QgKmw0ZSA9Ci0gICAgICAgICAg ICAgICAgbWFwX2RvbWFpbl9wYWdlKF9tZm4ocGFnZXRhYmxlX2dldF9wZm4odi0+YXJjaC5ndWVz dF90YWJsZSkpKTsKKyAgICAgICAgICAgICAgICBtYXBfZG9tYWluX3BhZ2UocGFnZXRhYmxlX2dl dF9tZm4odi0+YXJjaC5ndWVzdF90YWJsZSkpOwogCiAgICAgICAgICAgICBjLmNtcC0+Y3RybHJl Z1szXSA9IGNvbXBhdF9wZm5fdG9fY3IzKGw0ZV9nZXRfcGZuKCpsNGUpKTsKICAgICAgICAgICAg IHVubWFwX2RvbWFpbl9wYWdlKGw0ZSk7CmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvbW0vcDJt LWVwdC5jIGIveGVuL2FyY2gveDg2L21tL3AybS1lcHQuYwppbmRleCAyM2MwNTE4Li4yY2NhMGQw IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvbW0vcDJtLWVwdC5jCisrKyBiL3hlbi9hcmNoL3g4 Ni9tbS9wMm0tZXB0LmMKQEAgLTQzNCw3ICs0MzQsNyBAQCBzdGF0aWMgaW50IGVwdF9pbnZhbGlk YXRlX2VtdF9yYW5nZShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLAogICAgIHVuc2lnbmVkIGludCBp LCBpbmRleDsKICAgICBpbnQgd3JjLCByYyA9IDAsIHJldCA9IEdVRVNUX1RBQkxFX01BUF9GQUlM RUQ7CiAKLSAgICB0YWJsZSA9IG1hcF9kb21haW5fcGFnZShfbWZuKHBhZ2V0YWJsZV9nZXRfcGZu KHAybV9nZXRfcGFnZXRhYmxlKHAybSkpKSk7CisgICAgdGFibGUgPSBtYXBfZG9tYWluX3BhZ2Uo cGFnZXRhYmxlX2dldF9tZm4ocDJtX2dldF9wYWdldGFibGUocDJtKSkpOwogICAgIGZvciAoIGkg PSBwMm0tPmVwdC53bDsgaSA+IHRhcmdldDsgLS1pICkKICAgICB7CiAgICAgICAgIHJldCA9IGVw dF9uZXh0X2xldmVsKHAybSwgMSwgJnRhYmxlLCAmZ2ZuX3JlbWFpbmRlciwgaSk7CkBAIC03MTcs NyArNzE3LDcgQEAgZXB0X3NldF9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25l ZCBsb25nIGdmbiwgbWZuX3QgbWZuLAogICAgICAgICAgICAodGFyZ2V0ID09IDApKTsKICAgICBB U1NFUlQoIXAybV9pc19mb3JlaWduKHAybXQpIHx8IHRhcmdldCA9PSAwKTsKIAotICAgIHRhYmxl ID0gbWFwX2RvbWFpbl9wYWdlKF9tZm4ocGFnZXRhYmxlX2dldF9wZm4ocDJtX2dldF9wYWdldGFi bGUocDJtKSkpKTsKKyAgICB0YWJsZSA9IG1hcF9kb21haW5fcGFnZShwYWdldGFibGVfZ2V0X21m bihwMm1fZ2V0X3BhZ2V0YWJsZShwMm0pKSk7CiAKICAgICByZXQgPSBHVUVTVF9UQUJMRV9NQVBf RkFJTEVEOwogICAgIGZvciAoIGkgPSBlcHQtPndsOyBpID4gdGFyZ2V0OyBpLS0gKQpAQCAtOTE0 LDcgKzkxNCw4IEBAIHN0YXRpYyBtZm5fdCBlcHRfZ2V0X2VudHJ5KHN0cnVjdCBwMm1fZG9tYWlu ICpwMm0sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICBwMm1fcXVlcnlfdCBxLCB1bnNpZ25l ZCBpbnQgKnBhZ2Vfb3JkZXIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICBib29sX3QgKnN2 ZSkKIHsKLSAgICBlcHRfZW50cnlfdCAqdGFibGUgPSBtYXBfZG9tYWluX3BhZ2UoX21mbihwYWdl dGFibGVfZ2V0X3BmbihwMm1fZ2V0X3BhZ2V0YWJsZShwMm0pKSkpOworICAgIGVwdF9lbnRyeV90 ICp0YWJsZSA9CisgICAgICAgIG1hcF9kb21haW5fcGFnZShwYWdldGFibGVfZ2V0X21mbihwMm1f Z2V0X3BhZ2V0YWJsZShwMm0pKSk7CiAgICAgdW5zaWduZWQgbG9uZyBnZm5fcmVtYWluZGVyID0g Z2ZuOwogICAgIGVwdF9lbnRyeV90ICplcHRfZW50cnk7CiAgICAgdTMyIGluZGV4OwpAQCAtMTAy NCw3ICsxMDI1LDggQEAgdm9pZCBlcHRfd2Fsa190YWJsZShzdHJ1Y3QgZG9tYWluICpkLCB1bnNp Z25lZCBsb25nIGdmbikKIHsKICAgICBzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtID0gcDJtX2dldF9o b3N0cDJtKGQpOwogICAgIHN0cnVjdCBlcHRfZGF0YSAqZXB0ID0gJnAybS0+ZXB0OwotICAgIGVw dF9lbnRyeV90ICp0YWJsZSA9IG1hcF9kb21haW5fcGFnZShfbWZuKHBhZ2V0YWJsZV9nZXRfcGZu KHAybV9nZXRfcGFnZXRhYmxlKHAybSkpKSk7CisgICAgZXB0X2VudHJ5X3QgKnRhYmxlID0KKyAg ICAgICAgbWFwX2RvbWFpbl9wYWdlKHBhZ2V0YWJsZV9nZXRfbWZuKHAybV9nZXRfcGFnZXRhYmxl KHAybSkpKTsKICAgICB1bnNpZ25lZCBsb25nIGdmbl9yZW1haW5kZXIgPSBnZm47CiAKICAgICBp bnQgaTsKQEAgLTEzMjMsNyArMTMyNSw3IEBAIHN0YXRpYyB2b2lkIGVwdF9kdW1wX3AybV90YWJs ZSh1bnNpZ25lZCBjaGFyIGtleSkKICAgICAgICAgICAgIGNoYXIgYyA9IDA7CiAKICAgICAgICAg ICAgIGdmbl9yZW1haW5kZXIgPSBnZm47Ci0gICAgICAgICAgICB0YWJsZSA9IG1hcF9kb21haW5f cGFnZShfbWZuKHBhZ2V0YWJsZV9nZXRfcGZuKHAybV9nZXRfcGFnZXRhYmxlKHAybSkpKSk7Cisg ICAgICAgICAgICB0YWJsZSA9IG1hcF9kb21haW5fcGFnZShwYWdldGFibGVfZ2V0X21mbihwMm1f Z2V0X3BhZ2V0YWJsZShwMm0pKSk7CiAKICAgICAgICAgICAgIGZvciAoIGkgPSBlcHQtPndsOyBp ID4gMDsgaS0tICkKICAgICAgICAgICAgIHsKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9tbS9z aGFkb3cvbXVsdGkuYyBiL3hlbi9hcmNoL3g4Ni9tbS9zaGFkb3cvbXVsdGkuYwppbmRleCA4ZDRm MjQ0Li5hMDU3ZjJkIDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvbW0vc2hhZG93L211bHRpLmMK KysrIGIveGVuL2FyY2gveDg2L21tL3NoYWRvdy9tdWx0aS5jCkBAIC0zMzkxLDcgKzMzOTEsOCBA QCBzdGF0aWMgaW50IHNoX3BhZ2VfZmF1bHQoc3RydWN0IHZjcHUgKnYsCiAgICAgICAgICAgICBp bnQgaTsKICAgICAgICAgICAgIGZvciAoIGkgPSAwOyBpIDwgNDsgaSsrICkKICAgICAgICAgICAg IHsKLSAgICAgICAgICAgICAgICBtZm5fdCBzbWZuID0gX21mbihwYWdldGFibGVfZ2V0X3Bmbih2 LT5hcmNoLnNoYWRvd190YWJsZVtpXSkpOworICAgICAgICAgICAgICAgIG1mbl90IHNtZm4gPSBw YWdldGFibGVfZ2V0X21mbih2LT5hcmNoLnNoYWRvd190YWJsZVtpXSk7CisKICAgICAgICAgICAg ICAgICBpZiAoIG1mbl92YWxpZChzbWZuKSAmJiAobWZuX3goc21mbikgIT0gMCkgKQogICAgICAg ICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAgICAgdXNlZCB8PSAobWZuX3RvX3BhZ2Uoc21m biktPnYuc2guYmFjayA9PSBtZm5feChnbWZuKSk7CkBAIC00NjQ1LDcgKzQ2NDYsNyBAQCBzdGF0 aWMgdm9pZCBzaF9wYWdldGFibGVfZHlpbmcoc3RydWN0IHZjcHUgKnYsIHBhZGRyX3QgZ3BhKQog ICAgICAgICAgICAgaWYgKCBwYWdldGFibGVfaXNfbnVsbCh2LT5hcmNoLnNoYWRvd190YWJsZVtp XSkgKQogICAgICAgICAgICAgICAgIHNtZm4gPSBJTlZBTElEX01GTjsKICAgICAgICAgICAgIGVs c2UKLSAgICAgICAgICAgICAgICBzbWZuID0gX21mbihwYWdldGFibGVfZ2V0X3Bmbih2LT5hcmNo LnNoYWRvd190YWJsZVtpXSkpOworICAgICAgICAgICAgICAgIHNtZm4gPSBwYWdldGFibGVfZ2V0 X21mbih2LT5hcmNoLnNoYWRvd190YWJsZVtpXSk7CiAgICAgICAgIH0KICAgICAgICAgZWxzZQog ICAgICAgICB7Ci0tIAoyLjEuNAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5v cmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=