From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andrew Cooper <andrew.cooper3@citrix.com>
Subject: [PATCH 3/7] x86/mm: Misc cleanup to {create,
	replace}_grant_host_mapping()
Date: Tue, 12 Sep 2017 13:14:42 +0100
Message-ID: <1505218486-4416-4-git-send-email-andrew.cooper3@citrix.com>
References: <1505218486-4416-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: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1505218486-4416-1-git-send-email-andrew.cooper3@citrix.com>
List-Unsubscribe: <https://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
 <mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <https://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
 <mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Errors-To: xen-devel-bounces@lists.xen.org
Sender: "Xen-devel" <xen-devel-bounces@lists.xen.org>
To: Xen-devel <xen-devel@lists.xen.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>, Wei Liu <wei.liu2@citrix.com>, Jan Beulich <JBeulich@suse.com>
List-Id: xen-devel@lists.xenproject.org

VGhlIHB1cnBvc2Ugb2YgdGhpcyBwYXRjaCBpcyBzb2xlbHkgdG8gc2ltcGxpZnkgdGhlIHJlc3Vs
dGluZyBkaWZmIG9mIGxhdGVyCmNoYW5nZXMuCgogKiBGYWN0b3Igb3V0IGN1cnIgYW5kIGN1cnJk
IGF0IHRoZSBzdGFydCBvZiB0aGUgZnVuY3Rpb25zLgogKiBSZW5hbWUgcHRlIHRvIG5sMWUuCgpO
byBmdW5jdGlvbmFsIGNoYW5nZS4KClNpZ25lZC1vZmYtYnk6IEFuZHJldyBDb29wZXIgPGFuZHJl
dy5jb29wZXIzQGNpdHJpeC5jb20+Ci0tLQpDQzogSmFuIEJldWxpY2ggPEpCZXVsaWNoQHN1c2Uu
Y29tPgpDQzogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KLS0tCiB4ZW4vYXJjaC94ODYv
bW0uYyB8IDE4ICsrKysrKysrKystLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEwIGluc2VydGlv
bnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21tLmMgYi94
ZW4vYXJjaC94ODYvbW0uYwppbmRleCBkNWFiYTk2Li5hODQ4ZDdkIDEwMDY0NAotLS0gYS94ZW4v
YXJjaC94ODYvbW0uYworKysgYi94ZW4vYXJjaC94ODYvbW0uYwpAQCAtNDEyNSwxOSArNDEyNSwy
MSBAQCBzdGF0aWMgaW50IGRlc3Ryb3lfZ3JhbnRfdmFfbWFwcGluZygKIGludCBjcmVhdGVfZ3Jh
bnRfcHZfbWFwcGluZyh1aW50NjRfdCBhZGRyLCB1bnNpZ25lZCBsb25nIGZyYW1lLAogICAgICAg
ICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGludCBmbGFncywgdW5zaWduZWQgaW50IGNh
Y2hlX2ZsYWdzKQogewotICAgIGwxX3BnZW50cnlfdCBwdGU7CisgICAgc3RydWN0IHZjcHUgKmN1
cnIgPSBjdXJyZW50OworICAgIGwxX3BnZW50cnlfdCBubDFlOwogCi0gICAgcHRlID0gbDFlX2Zy
b21fcGZuKGZyYW1lLCBncmFudF90b19wdGVfZmxhZ3MoZmxhZ3MsIGNhY2hlX2ZsYWdzKSk7Cisg
ICAgbmwxZSA9IGwxZV9mcm9tX3BmbihmcmFtZSwgZ3JhbnRfdG9fcHRlX2ZsYWdzKGZsYWdzLCBj
YWNoZV9mbGFncykpOwogCiAgICAgaWYgKCBmbGFncyAmIEdOVE1BUF9jb250YWluc19wdGUgKQot
ICAgICAgICByZXR1cm4gY3JlYXRlX2dyYW50X3B0ZV9tYXBwaW5nKGFkZHIsIHB0ZSwgY3VycmVu
dCk7Ci0gICAgcmV0dXJuIGNyZWF0ZV9ncmFudF92YV9tYXBwaW5nKGFkZHIsIHB0ZSwgY3VycmVu
dCk7CisgICAgICAgIHJldHVybiBjcmVhdGVfZ3JhbnRfcHRlX21hcHBpbmcoYWRkciwgbmwxZSwg
Y3Vycik7CisgICAgcmV0dXJuIGNyZWF0ZV9ncmFudF92YV9tYXBwaW5nKGFkZHIsIG5sMWUsIGN1
cnIpOwogfQogCiBpbnQgcmVwbGFjZV9ncmFudF9wdl9tYXBwaW5nKHVpbnQ2NF90IGFkZHIsIHVu
c2lnbmVkIGxvbmcgZnJhbWUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQ2NF90
IG5ld19hZGRyLCB1bnNpZ25lZCBpbnQgZmxhZ3MpCiB7CiAgICAgc3RydWN0IHZjcHUgKmN1cnIg
PSBjdXJyZW50OworICAgIHN0cnVjdCBkb21haW4gKmN1cnJkID0gY3Vyci0+ZG9tYWluOwogICAg
IGwxX3BnZW50cnlfdCAqcGwxZSwgb2wxZTsKICAgICBtZm5fdCBnbDFtZm47CiAgICAgc3RydWN0
IHBhZ2VfaW5mbyAqbDFwZzsKQEAgLTQxNDksNyArNDE1MSw3IEBAIGludCByZXBsYWNlX2dyYW50
X3B2X21hcHBpbmcodWludDY0X3QgYWRkciwgdW5zaWduZWQgbG9uZyBmcmFtZSwKICAgICAgKiBh
bHNvIG9wZW4tY29kZSByZWxldmFudCBwYXJ0cyBvZiBhZGp1c3RfZ3Vlc3RfbDFlKCkuIERvbid0
IG1pcnJvcgogICAgICAqIGF2YWlsYWJsZSBhbmQgY2FjaGFiaWxpdHkgZmxhZ3MsIHRob3VnaC4K
ICAgICAgKi8KLSAgICBpZiAoICFpc19wdl8zMmJpdF9kb21haW4oY3Vyci0+ZG9tYWluKSApCisg
ICAgaWYgKCAhaXNfcHZfMzJiaXRfZG9tYWluKGN1cnJkKSApCiAgICAgICAgIGdyYW50X3B0ZV9m
bGFncyB8PSAoZ3JhbnRfcHRlX2ZsYWdzICYgX1BBR0VfVVNFUikKICAgICAgICAgICAgICAgICAg
ICAgICAgICAgID8gX1BBR0VfR0xPQkFMCiAgICAgICAgICAgICAgICAgICAgICAgICAgICA6IF9Q
QUdFX0dVRVNUX0tFUk5FTCB8IF9QQUdFX1VTRVI7CkBAIC00MTU4LDcgKzQxNjAsNyBAQCBpbnQg
cmVwbGFjZV9ncmFudF9wdl9tYXBwaW5nKHVpbnQ2NF90IGFkZHIsIHVuc2lnbmVkIGxvbmcgZnJh
bWUsCiAgICAgewogICAgICAgICBpZiAoICFuZXdfYWRkciApCiAgICAgICAgICAgICByZXR1cm4g
ZGVzdHJveV9ncmFudF9wdGVfbWFwcGluZyhhZGRyLCBmcmFtZSwgZ3JhbnRfcHRlX2ZsYWdzLAot
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY3Vyci0+ZG9tYWlu
KTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGN1cnJkKTsK
IAogICAgICAgICByZXR1cm4gR05UU1RfZ2VuZXJhbF9lcnJvcjsKICAgICB9CkBAIC00MTc0LDcg
KzQxNzYsNyBAQCBpbnQgcmVwbGFjZV9ncmFudF9wdl9tYXBwaW5nKHVpbnQ2NF90IGFkZHIsIHVu
c2lnbmVkIGxvbmcgZnJhbWUsCiAgICAgICAgIHJldHVybiBHTlRTVF9nZW5lcmFsX2Vycm9yOwog
ICAgIH0KIAotICAgIGlmICggIWdldF9wYWdlX2Zyb21fbWZuKGdsMW1mbiwgY3VycmVudC0+ZG9t
YWluKSApCisgICAgaWYgKCAhZ2V0X3BhZ2VfZnJvbV9tZm4oZ2wxbWZuLCBjdXJyZCkgKQogICAg
IHsKICAgICAgICAgdW5tYXBfZG9tYWluX3BhZ2UocGwxZSk7CiAgICAgICAgIHJldHVybiBHTlRT
VF9nZW5lcmFsX2Vycm9yOwpAQCAtNDIxNCw3ICs0MjE2LDcgQEAgaW50IHJlcGxhY2VfZ3JhbnRf
cHZfbWFwcGluZyh1aW50NjRfdCBhZGRyLCB1bnNpZ25lZCBsb25nIGZyYW1lLAogCiAgICAgcmMg
PSByZXBsYWNlX2dyYW50X3ZhX21hcHBpbmcoYWRkciwgZnJhbWUsIGdyYW50X3B0ZV9mbGFncywg
b2wxZSwgY3Vycik7CiAgICAgaWYgKCByYyApCi0gICAgICAgIHB1dF9wYWdlX2Zyb21fbDFlKG9s
MWUsIGN1cnItPmRvbWFpbik7CisgICAgICAgIHB1dF9wYWdlX2Zyb21fbDFlKG9sMWUsIGN1cnJk
KTsKIAogICAgIHJldHVybiByYzsKIH0KLS0gCjIuMS40CgoKX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2
ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==