From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 2/2] x86/mm: Use mfn_t for make_cr3() Date: Wed, 30 Aug 2017 13:19:33 +0100 Message-ID: <1504095573-14153-2-git-send-email-andrew.cooper3@citrix.com> References: <1504095573-14153-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: In-Reply-To: <1504095573-14153-1-git-send-email-andrew.cooper3@citrix.com> 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 , Wei Liu , Jan Beulich , Tim Deegan List-Id: xen-devel@lists.xenproject.org Tm8gZnVuY3Rpb25hbCBjaGFuZ2UuCgpTaWduZWQtb2ZmLWJ5OiBBbmRyZXcgQ29vcGVyIDxhbmRy ZXcuY29vcGVyM0BjaXRyaXguY29tPgotLS0KQ0M6IEphbiBCZXVsaWNoIDxKQmV1bGljaEBzdXNl LmNvbT4KQ0M6IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+CkNDOiBUaW0gRGVlZ2FuIDx0 aW1AeGVuLm9yZz4KQ0M6IEdlb3JnZSBEdW5sYXAgPGdlb3JnZS5kdW5sYXBAZXUuY2l0cml4LmNv bT4KLS0tCiB4ZW4vYXJjaC94ODYvbW0uYyAgICAgICAgICAgICAgIHwgMTAgKysrKystLS0tLQog eGVuL2FyY2gveDg2L21tL2hhcC9oYXAuYyAgICAgICB8ICAyICstCiB4ZW4vYXJjaC94ODYvbW0v c2hhZG93L2NvbW1vbi5jIHwgIDggKysrKy0tLS0KIHhlbi9hcmNoL3g4Ni9tbS9zaGFkb3cvbXVs dGkuYyAgfCAgNCArKy0tCiB4ZW4vaW5jbHVkZS9hc20teDg2L21tLmggICAgICAgIHwgIDIgKy0K IDUgZmlsZXMgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEveGVuL2FyY2gveDg2L21tLmMgYi94ZW4vYXJjaC94ODYvbW0uYwppbmRleCBkYzA3 YjRmLi5mMGM4MWU3IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvbW0uYworKysgYi94ZW4vYXJj aC94ODYvbW0uYwpAQCAtNDk4LDkgKzQ5OCw5IEBAIHZvaWQgZnJlZV9zaGFyZWRfZG9taGVhcF9w YWdlKHN0cnVjdCBwYWdlX2luZm8gKnBhZ2UpCiAgICAgZnJlZV9kb21oZWFwX3BhZ2UocGFnZSk7 CiB9CiAKLXZvaWQgbWFrZV9jcjMoc3RydWN0IHZjcHUgKnYsIHVuc2lnbmVkIGxvbmcgbWZuKQor dm9pZCBtYWtlX2NyMyhzdHJ1Y3QgdmNwdSAqdiwgbWZuX3QgbWZuKQogewotICAgIHYtPmFyY2gu Y3IzID0gbWZuIDw8IFBBR0VfU0hJRlQ7CisgICAgdi0+YXJjaC5jcjMgPSBtZm5feChtZm4pIDw8 IFBBR0VfU0hJRlQ7CiB9CiAKIHZvaWQgd3JpdGVfcHRiYXNlKHN0cnVjdCB2Y3B1ICp2KQpAQCAt NTE4LDcgKzUxOCw3IEBAIHZvaWQgd3JpdGVfcHRiYXNlKHN0cnVjdCB2Y3B1ICp2KQogICovCiB2 b2lkIHVwZGF0ZV9jcjMoc3RydWN0IHZjcHUgKnYpCiB7Ci0gICAgdW5zaWduZWQgbG9uZyBjcjNf bWZuOworICAgIG1mbl90IGNyM19tZm47CiAKICAgICBpZiAoIHBhZ2luZ19tb2RlX2VuYWJsZWQo di0+ZG9tYWluKSApCiAgICAgewpAQCAtNTI3LDkgKzUyNyw5IEBAIHZvaWQgdXBkYXRlX2NyMyhz dHJ1Y3QgdmNwdSAqdikKICAgICB9CiAKICAgICBpZiAoICEodi0+YXJjaC5mbGFncyAmIFRGX2tl cm5lbF9tb2RlKSApCi0gICAgICAgIGNyM19tZm4gPSBwYWdldGFibGVfZ2V0X3Bmbih2LT5hcmNo Lmd1ZXN0X3RhYmxlX3VzZXIpOworICAgICAgICBjcjNfbWZuID0gcGFnZXRhYmxlX2dldF9tZm4o di0+YXJjaC5ndWVzdF90YWJsZV91c2VyKTsKICAgICBlbHNlCi0gICAgICAgIGNyM19tZm4gPSBw YWdldGFibGVfZ2V0X3Bmbih2LT5hcmNoLmd1ZXN0X3RhYmxlKTsKKyAgICAgICAgY3IzX21mbiA9 IHBhZ2V0YWJsZV9nZXRfbWZuKHYtPmFyY2guZ3Vlc3RfdGFibGUpOwogCiAgICAgbWFrZV9jcjMo diwgY3IzX21mbik7CiB9CmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvbW0vaGFwL2hhcC5jIGIv eGVuL2FyY2gveDg2L21tL2hhcC9oYXAuYwppbmRleCAxNWU0ODc3Li42OTQ2ZmRlIDEwMDY0NAot LS0gYS94ZW4vYXJjaC94ODYvbW0vaGFwL2hhcC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9tbS9oYXAv aGFwLmMKQEAgLTcxOSw3ICs3MTksNyBAQCBzdGF0aWMgdm9pZCBoYXBfdXBkYXRlX3BhZ2luZ19t b2RlcyhzdHJ1Y3QgdmNwdSAqdikKICAgICB7CiAgICAgICAgIG1mbl90IG1tZm4gPSBoYXBfbWFr ZV9tb25pdG9yX3RhYmxlKHYpOwogICAgICAgICB2LT5hcmNoLm1vbml0b3JfdGFibGUgPSBwYWdl dGFibGVfZnJvbV9tZm4obW1mbik7Ci0gICAgICAgIG1ha2VfY3IzKHYsIG1mbl94KG1tZm4pKTsK KyAgICAgICAgbWFrZV9jcjModiwgbW1mbik7CiAgICAgICAgIGh2bV91cGRhdGVfaG9zdF9jcjMo dik7CiAgICAgfQogCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvbW0vc2hhZG93L2NvbW1vbi5j IGIveGVuL2FyY2gveDg2L21tL3NoYWRvdy9jb21tb24uYwppbmRleCBlOGVlNmRiLi4zOTI2ZWQ2 IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvbW0vc2hhZG93L2NvbW1vbi5jCisrKyBiL3hlbi9h cmNoL3g4Ni9tbS9zaGFkb3cvY29tbW9uLmMKQEAgLTI5NjEsNyArMjk2MSw3IEBAIHN0YXRpYyB2 b2lkIHNoX3VwZGF0ZV9wYWdpbmdfbW9kZXMoc3RydWN0IHZjcHUgKnYpCiAgICAgICAgIHsKICAg ICAgICAgICAgIG1mbl90IG1tZm4gPSB2LT5hcmNoLnBhZ2luZy5tb2RlLT5zaGFkb3cubWFrZV9t b25pdG9yX3RhYmxlKHYpOwogICAgICAgICAgICAgdi0+YXJjaC5tb25pdG9yX3RhYmxlID0gcGFn ZXRhYmxlX2Zyb21fbWZuKG1tZm4pOwotICAgICAgICAgICAgbWFrZV9jcjModiwgbWZuX3gobW1m bikpOworICAgICAgICAgICAgbWFrZV9jcjModiwgbW1mbik7CiAgICAgICAgICAgICBodm1fdXBk YXRlX2hvc3RfY3IzKHYpOwogICAgICAgICB9CiAKQEAgLTMwMDQsNyArMzAwNCw3IEBAIHN0YXRp YyB2b2lkIHNoX3VwZGF0ZV9wYWdpbmdfbW9kZXMoc3RydWN0IHZjcHUgKnYpCiAgICAgICAgICAg ICAgICAgLyogRG9uJ3QgYmUgcnVubmluZyBvbiB0aGUgb2xkIG1vbml0b3IgdGFibGUgd2hlbiB3 ZQogICAgICAgICAgICAgICAgICAqIHB1bGwgaXQgZG93biEgIFN3aXRjaCBDUjMsIGFuZCB3YXJu IHRoZSBIVk0gY29kZSB0aGF0CiAgICAgICAgICAgICAgICAgICogaXRzIGhvc3QgY3IzIGhhcyBj aGFuZ2VkLiAqLwotICAgICAgICAgICAgICAgIG1ha2VfY3IzKHYsIG1mbl94KG5ld19tZm4pKTsK KyAgICAgICAgICAgICAgICBtYWtlX2NyMyh2LCBuZXdfbWZuKTsKICAgICAgICAgICAgICAgICBp ZiAoIHYgPT0gY3VycmVudCApCiAgICAgICAgICAgICAgICAgICAgIHdyaXRlX3B0YmFzZSh2KTsK ICAgICAgICAgICAgICAgICBodm1fdXBkYXRlX2hvc3RfY3IzKHYpOwpAQCAtMzM4MCw5ICszMzgw LDkgQEAgc3RhdGljIGludCBzaGFkb3dfb25lX2JpdF9kaXNhYmxlKHN0cnVjdCBkb21haW4gKmQs IHUzMiBtb2RlKQogICAgICAgICAgICAgaWYgKCB2LT5hcmNoLnBhZ2luZy5tb2RlICkKICAgICAg ICAgICAgICAgICB2LT5hcmNoLnBhZ2luZy5tb2RlLT5zaGFkb3cuZGV0YWNoX29sZF90YWJsZXMo dik7CiAgICAgICAgICAgICBpZiAoICEodi0+YXJjaC5mbGFncyAmIFRGX2tlcm5lbF9tb2RlKSAp Ci0gICAgICAgICAgICAgICAgbWFrZV9jcjModiwgcGFnZXRhYmxlX2dldF9wZm4odi0+YXJjaC5n dWVzdF90YWJsZV91c2VyKSk7CisgICAgICAgICAgICAgICAgbWFrZV9jcjModiwgcGFnZXRhYmxl X2dldF9tZm4odi0+YXJjaC5ndWVzdF90YWJsZV91c2VyKSk7CiAgICAgICAgICAgICBlbHNlCi0g ICAgICAgICAgICAgICAgbWFrZV9jcjModiwgcGFnZXRhYmxlX2dldF9wZm4odi0+YXJjaC5ndWVz dF90YWJsZSkpOworICAgICAgICAgICAgICAgIG1ha2VfY3IzKHYsIHBhZ2V0YWJsZV9nZXRfbWZu KHYtPmFyY2guZ3Vlc3RfdGFibGUpKTsKIAogI2lmIChTSEFET1dfT1BUSU1JWkFUSU9OUyAmIFNI T1BUX09VVF9PRl9TWU5DKQogICAgICAgICAgICAgewpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2 L21tL3NoYWRvdy9tdWx0aS5jIGIveGVuL2FyY2gveDg2L21tL3NoYWRvdy9tdWx0aS5jCmluZGV4 IGM1YzBhZjguLmY3ZWZlNjYgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9tbS9zaGFkb3cvbXVs dGkuYworKysgYi94ZW4vYXJjaC94ODYvbW0vc2hhZG93L211bHRpLmMKQEAgLTQyNzMsNyArNDI3 Myw3IEBAIHNoX3VwZGF0ZV9jcjMoc3RydWN0IHZjcHUgKnYsIGludCBkb19sb2NraW5nKQogICAg IC8vLwogICAgIGlmICggc2hhZG93X21vZGVfZXh0ZXJuYWwoZCkgKQogICAgIHsKLSAgICAgICAg bWFrZV9jcjModiwgcGFnZXRhYmxlX2dldF9wZm4odi0+YXJjaC5tb25pdG9yX3RhYmxlKSk7Cisg ICAgICAgIG1ha2VfY3IzKHYsIHBhZ2V0YWJsZV9nZXRfbWZuKHYtPmFyY2gubW9uaXRvcl90YWJs ZSkpOwogICAgIH0KICAgICBlbHNlIC8vIG5vdCBzaGFkb3dfbW9kZV9leHRlcm5hbC4uLgogICAg IHsKQEAgLTQyODcsNyArNDI4Nyw3IEBAIHNoX3VwZGF0ZV9jcjMoc3RydWN0IHZjcHUgKnYsIGlu dCBkb19sb2NraW5nKQogICAgICAgICB2LT5hcmNoLmNyMyA9IHZpcnRfdG9fbWFkZHIoJnYtPmFy Y2gucGFnaW5nLnNoYWRvdy5sM3RhYmxlKTsKICNlbHNlCiAgICAgICAgIC8qIDQtb24tNDogSnVz dCB1c2UgdGhlIHNoYWRvdyB0b3AtbGV2ZWwgZGlyZWN0bHkgKi8KLSAgICAgICAgbWFrZV9jcjMo diwgcGFnZXRhYmxlX2dldF9wZm4odi0+YXJjaC5zaGFkb3dfdGFibGVbMF0pKTsKKyAgICAgICAg bWFrZV9jcjModiwgcGFnZXRhYmxlX2dldF9tZm4odi0+YXJjaC5zaGFkb3dfdGFibGVbMF0pKTsK ICNlbmRpZgogICAgIH0KIApkaWZmIC0tZ2l0IGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9tbS5oIGIv eGVuL2luY2x1ZGUvYXNtLXg4Ni9tbS5oCmluZGV4IDRjMDNhMzMuLmRjZTNmMTYgMTAwNjQ0Ci0t LSBhL3hlbi9pbmNsdWRlL2FzbS14ODYvbW0uaAorKysgYi94ZW4vaW5jbHVkZS9hc20teDg2L21t LmgKQEAgLTU0MCw3ICs1NDAsNyBAQCB2b2lkIGF1ZGl0X2RvbWFpbnModm9pZCk7CiAjZW5kaWYK IAogaW50IG5ld19ndWVzdF9jcjMobWZuX3QgbWZuKTsKLXZvaWQgbWFrZV9jcjMoc3RydWN0IHZj cHUgKnYsIHVuc2lnbmVkIGxvbmcgbWZuKTsKK3ZvaWQgbWFrZV9jcjMoc3RydWN0IHZjcHUgKnYs IG1mbl90IG1mbik7CiB2b2lkIHVwZGF0ZV9jcjMoc3RydWN0IHZjcHUgKnYpOwogaW50IHZjcHVf ZGVzdHJveV9wYWdldGFibGVzKHN0cnVjdCB2Y3B1ICopOwogdm9pZCAqZG9fcGFnZV93YWxrKHN0 cnVjdCB2Y3B1ICp2LCB1bnNpZ25lZCBsb25nIGFkZHIpOwotLSAKMi4xLjQKCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBs aXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2 ZWwK