From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH] x86/mm: Rearrange guest_get_eff_{, kern_}l1e() not be void Date: Wed, 30 Aug 2017 14:22:05 +0100 Message-ID: <1504099325-31132-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: Andrew Cooper , Wei Liu , Jan Beulich List-Id: xen-devel@lists.xenproject.org Q292ZXJpdHkgY29tcGxhaW5zIHRoYXQgZ2wxZS5sMSBtYXkgYmUgdXNlZCB3aGlsZSB1bmluaXRp YWxpc2VkIGluCm1hcF9sZHRfc2hhZG93X3BhZ2UoKS4gIFRoaXMgaXNuJ3QgYWN0dWFsbHkgYWNj dXJhdGUgYXMgZ3Vlc3RfZ2V0X2VmZl9sMWUoKQp3aWxsIGFsd2F5cyB3cml0ZSB0byBpdHMgcGFy YW1ldGVyLgoKSG93ZXZlciwgaGF2aW5nIGEgdm9pZCBmdW5jdGlvbiB3aGljaCByZXR1cm5zIGEg NjRiaXQgdmFsdWUgdmlhIHBvaW50ZXIgaXMKcmF0aGVyIHNpbGx5LiAgUmVhcnJhbmdlIHRoZSBm dW5jdGlvbnMgdG8gcmV0dXJuIGwxX3BnZW50cnlfdC4KCk5vIGZ1bmN0aW9uYWwgY2hhbmdlLCBi dXQgaG9wZWZ1bGx5IHNob3VsZCBoZWxwIENvdmVyaXR5IG5vdCB0byBjb21lIHRvIHRoZQp3cm9u ZyBjb25jbHVzaW9uLgoKQmxvYXQtby1tZXRlciBhbHNvIHJlcG9ydHMgYSBtb2Rlc3QgaW1wcm92 ZW1lbnQ6CiAgYWRkL3JlbW92ZTogMC8wIGdyb3cvc2hyaW5rOiAwLzQgdXAvZG93bjogMC8tNzEg KC03MSkKICBmdW5jdGlvbiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvbGQg ICAgIG5ldyAgIGRlbHRhCiAgZ3Vlc3RfZ2V0X2VmZl9sMWUgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIDgyICAgICAgNzUgICAgICAtNwogIG1taW9fcm9fZG9fcGFnZV9mYXVsdCAgICAgICAg ICAgICAgICAgICAgICAgIDUzMCAgICAgNTE0ICAgICAtMTYKICBtYXBfbGR0X3NoYWRvd19wYWdl ICAgICAgICAgICAgICAgICAgICAgICAgICA1MDEgICAgIDQ4NSAgICAgLTE2CiAgcHR3cl9kb19w YWdlX2ZhdWx0ICAgICAgICAgICAgICAgICAgICAgICAgICAgNjE1ICAgICA1ODMgICAgIC0zMgoK U2lnbmVkLW9mZi1ieTogQW5kcmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4K LS0tCkNDOiBKYW4gQmV1bGljaCA8SkJldWxpY2hAc3VzZS5jb20+CkNDOiBXZWkgTGl1IDx3ZWku bGl1MkBjaXRyaXguY29tPgotLS0KIHhlbi9hcmNoL3g4Ni9tbS5jIHwgMjMgKysrKysrKysrKysr KysrLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9tbS5jIGIveGVuL2FyY2gveDg2L21tLmMK aW5kZXggZjBjODFlNy4uZmUxNTI5ZSAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21tLmMKKysr IGIveGVuL2FyY2gveDg2L21tLmMKQEAgLTU2OCwzNCArNTY4LDQxIEBAIHN0YXRpYyBpbmxpbmUg dm9pZCBndWVzdF91bm1hcF9sMWUodm9pZCAqcCkKIH0KIAogLyogUmVhZCBhIFBWIGd1ZXN0J3Mg bDFlIHRoYXQgbWFwcyB0aGlzIGxpbmVhciBhZGRyZXNzLiAqLwotc3RhdGljIHZvaWQgZ3Vlc3Rf Z2V0X2VmZl9sMWUodW5zaWduZWQgbG9uZyBsaW5lYXIsIGwxX3BnZW50cnlfdCAqZWZmX2wxZSkK K3N0YXRpYyBsMV9wZ2VudHJ5X3QgZ3Vlc3RfZ2V0X2VmZl9sMWUodW5zaWduZWQgbG9uZyBsaW5l YXIpCiB7CisgICAgbDFfcGdlbnRyeV90IGwxZTsKKwogICAgIEFTU0VSVCghcGFnaW5nX21vZGVf dHJhbnNsYXRlKGN1cnJlbnQtPmRvbWFpbikpOwogICAgIEFTU0VSVCghcGFnaW5nX21vZGVfZXh0 ZXJuYWwoY3VycmVudC0+ZG9tYWluKSk7CiAKICAgICBpZiAoIHVubGlrZWx5KCFfX2FkZHJfb2so bGluZWFyKSkgfHwKLSAgICAgICAgIF9fY29weV9mcm9tX3VzZXIoZWZmX2wxZSwKKyAgICAgICAg IF9fY29weV9mcm9tX3VzZXIoJmwxZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgJl9fbGlu ZWFyX2wxX3RhYmxlW2wxX2xpbmVhcl9vZmZzZXQobGluZWFyKV0sCiAgICAgICAgICAgICAgICAg ICAgICAgICAgIHNpemVvZihsMV9wZ2VudHJ5X3QpKSApCi0gICAgICAgICplZmZfbDFlID0gbDFl X2VtcHR5KCk7CisgICAgICAgIGwxZSA9IGwxZV9lbXB0eSgpOworCisgICAgcmV0dXJuIGwxZTsK IH0KIAogLyoKICAqIFJlYWQgdGhlIGd1ZXN0J3MgbDFlIHRoYXQgbWFwcyB0aGlzIGFkZHJlc3Ms IGZyb20gdGhlIGtlcm5lbC1tb2RlCiAgKiBwYWdlIHRhYmxlcy4KICAqLwotc3RhdGljIHZvaWQg Z3Vlc3RfZ2V0X2VmZl9rZXJuX2wxZSh1bnNpZ25lZCBsb25nIGxpbmVhciwgbDFfcGdlbnRyeV90 ICplZmZfbDFlKQorc3RhdGljIGwxX3BnZW50cnlfdCBndWVzdF9nZXRfZWZmX2tlcm5fbDFlKHVu c2lnbmVkIGxvbmcgbGluZWFyKQogewogICAgIHN0cnVjdCB2Y3B1ICpjdXJyID0gY3VycmVudDsK ICAgICBjb25zdCBib29sIHVzZXJfbW9kZSA9ICEoY3Vyci0+YXJjaC5mbGFncyAmIFRGX2tlcm5l bF9tb2RlKTsKKyAgICBsMV9wZ2VudHJ5X3QgbDFlOwogCiAgICAgaWYgKCB1c2VyX21vZGUgKQog ICAgICAgICB0b2dnbGVfZ3Vlc3RfbW9kZShjdXJyKTsKIAotICAgIGd1ZXN0X2dldF9lZmZfbDFl KGxpbmVhciwgZWZmX2wxZSk7CisgICAgbDFlID0gZ3Vlc3RfZ2V0X2VmZl9sMWUobGluZWFyKTsK IAogICAgIGlmICggdXNlcl9tb2RlICkKICAgICAgICAgdG9nZ2xlX2d1ZXN0X21vZGUoY3Vycik7 CisKKyAgICByZXR1cm4gbDFlOwogfQogCiBzdGF0aWMgaW5saW5lIHZvaWQgcGFnZV9zZXRfdGxi Zmx1c2hfdGltZXN0YW1wKHN0cnVjdCBwYWdlX2luZm8gKnBhZ2UpCkBAIC02OTMsNyArNzAwLDcg QEAgYm9vbCBtYXBfbGR0X3NoYWRvd19wYWdlKHVuc2lnbmVkIGludCBvZmZzZXQpCiAgICAgaWYg KCBpc19wdl8zMmJpdF9kb21haW4oZCkgKQogICAgICAgICBsaW5lYXIgPSAodWludDMyX3QpbGlu ZWFyOwogCi0gICAgZ3Vlc3RfZ2V0X2VmZl9rZXJuX2wxZShsaW5lYXIsICZnbDFlKTsKKyAgICBn bDFlID0gZ3Vlc3RfZ2V0X2VmZl9rZXJuX2wxZShsaW5lYXIpOwogICAgIGlmICggdW5saWtlbHko IShsMWVfZ2V0X2ZsYWdzKGdsMWUpICYgX1BBR0VfUFJFU0VOVCkpICkKICAgICAgICAgcmV0dXJu IGZhbHNlOwogCkBAIC01MTkyLDcgKzUxOTksNyBAQCBpbnQgcHR3cl9kb19wYWdlX2ZhdWx0KHN0 cnVjdCB2Y3B1ICp2LCB1bnNpZ25lZCBsb25nIGFkZHIsCiAgICAgaW50IHJjOwogCiAgICAgLyog QXR0ZW1wdCB0byByZWFkIHRoZSBQVEUgdGhhdCBtYXBzIHRoZSBWQSBiZWluZyBhY2Nlc3NlZC4g Ki8KLSAgICBndWVzdF9nZXRfZWZmX2wxZShhZGRyLCAmcHRlKTsKKyAgICBwdGUgPSBndWVzdF9n ZXRfZWZmX2wxZShhZGRyKTsKIAogICAgIC8qIFdlIGFyZSBsb29raW5nIG9ubHkgZm9yIHJlYWQt b25seSBtYXBwaW5ncyBvZiBwLnQuIHBhZ2VzLiAqLwogICAgIGlmICggKChsMWVfZ2V0X2ZsYWdz KHB0ZSkgJiAoX1BBR0VfUFJFU0VOVHxfUEFHRV9SVykpICE9IF9QQUdFX1BSRVNFTlQpIHx8CkBA IC01MzQ3LDcgKzUzNTQsNyBAQCBpbnQgbW1pb19yb19kb19wYWdlX2ZhdWx0KHN0cnVjdCB2Y3B1 ICp2LCB1bnNpZ25lZCBsb25nIGFkZHIsCiAgICAgaW50IHJjOwogCiAgICAgLyogQXR0ZW1wdCB0 byByZWFkIHRoZSBQVEUgdGhhdCBtYXBzIHRoZSBWQSBiZWluZyBhY2Nlc3NlZC4gKi8KLSAgICBn dWVzdF9nZXRfZWZmX2wxZShhZGRyLCAmcHRlKTsKKyAgICBwdGUgPSBndWVzdF9nZXRfZWZmX2wx ZShhZGRyKTsKIAogICAgIC8qIFdlIGFyZSBsb29raW5nIG9ubHkgZm9yIHJlYWQtb25seSBtYXBw aW5ncyBvZiBNTUlPIHBhZ2VzLiAqLwogICAgIGlmICggKChsMWVfZ2V0X2ZsYWdzKHB0ZSkgJiAo X1BBR0VfUFJFU0VOVHxfUEFHRV9SVykpICE9IF9QQUdFX1BSRVNFTlQpICkKLS0gCjIuMS40CgoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVs IG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5v cmcveGVuLWRldmVsCg==