From mboxrd@z Thu Jan  1 00:00:00 1970
From: Borislav Petkov <bp@alien8.de>
Subject: [PATCH] x86/paravirt: Cleanup native_patch()
Date: Sat, 8 Sep 2018 17:28:00 +0200
Message-ID: <20180908152800.GA8286@zn.tnic>
References: <20180907104917.12502-1-bp@alien8.de>
	<20180907105112.GD12849@zn.tnic> <20180907201050.GF12849@zn.tnic>
	<65bb69fa-855f-9efc-19ba-c0fab69f468c@suse.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <virtualization-bounces@lists.linux-foundation.org>
Content-Disposition: inline
In-Reply-To: <65bb69fa-855f-9efc-19ba-c0fab69f468c@suse.com>
List-Unsubscribe: <https://lists.linuxfoundation.org/mailman/options/virtualization>,
	<mailto:virtualization-request@lists.linux-foundation.org?subject=unsubscribe>
List-Archive: <http://lists.linuxfoundation.org/pipermail/virtualization/>
List-Post: <mailto:virtualization@lists.linux-foundation.org>
List-Help: <mailto:virtualization-request@lists.linux-foundation.org?subject=help>
List-Subscribe: <https://lists.linuxfoundation.org/mailman/listinfo/virtualization>,
	<mailto:virtualization-request@lists.linux-foundation.org?subject=subscribe>
Sender: virtualization-bounces@lists.linux-foundation.org
Errors-To: virtualization-bounces@lists.linux-foundation.org
To: Juergen Gross <jgross@suse.com>
Cc: x86@kernel.org, LKML <linux-kernel@vger.kernel.org>, virtualization@lists.linux-foundation.org
List-Id: virtualization@lists.linuxfoundation.org

V2hlbiBDT05GSUdfUEFSQVZJUlRfU1BJTkxPQ0tTPW4sIGl0IGZpcmVzCgogIGFyY2gveDg2L2tl
cm5lbC9wYXJhdmlydF9wYXRjaF82NC5jOiBJbiBmdW5jdGlvbiDigJhuYXRpdmVfcGF0Y2jigJk6
CiAgYXJjaC94ODYva2VybmVsL3BhcmF2aXJ0X3BhdGNoXzY0LmM6ODk6MTogd2FybmluZzogbGFi
ZWwg4oCYcGF0Y2hfc2l0ZeKAmSBkZWZpbmVkIGJ1dCBub3QgdXNlZCBbLVd1bnVzZWQtbGFiZWxd
CiAgIHBhdGNoX3NpdGU6CgpidXQgdGhvc2UgbGFiZWxzIGNhbiBzaW1wbHkgYmUgcmVtb3ZlZCBi
eSBkaXJlY3RseSBjYWxsaW5nIHRoZQpyZXNwZWN0aXZlIGZ1bmN0aW9ucyB0aGVyZS4KCkdldCBy
aWQgb2YgbG9jYWwgdmFyaWFibGVzIHRvbywgd2hpbGUgYXQgaXQuCgpTaWduZWQtb2ZmLWJ5OiBC
b3Jpc2xhdiBQZXRrb3YgPGJwQHN1c2UuZGU+CkNjOiBKdWVyZ2VuIEdyb3NzIDxqZ3Jvc3NAc3Vz
ZS5jb20+CkNjOiB4ODZAa2VybmVsLm9yZwpDYzogdmlydHVhbGl6YXRpb25AbGlzdHMubGludXgt
Zm91bmRhdGlvbi5vcmcKLS0tCgpJdCBsb29rcyBldmVuIG1vcmUgY2xlYW5lciBub3cuIDopCgog
YXJjaC94ODYva2VybmVsL3BhcmF2aXJ0X3BhdGNoXzMyLmMgfCA0OCArKysrKysrKysrKy0tLS0t
LS0tLS0tLS0tLS0tCiBhcmNoL3g4Ni9rZXJuZWwvcGFyYXZpcnRfcGF0Y2hfNjQuYyB8IDQ5ICsr
KysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDM5IGluc2VydGlv
bnMoKyksIDU4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2FyY2gveDg2L2tlcm5lbC9wYXJh
dmlydF9wYXRjaF8zMi5jIGIvYXJjaC94ODYva2VybmVsL3BhcmF2aXJ0X3BhdGNoXzMyLmMKaW5k
ZXggZDQ2MGNiY2FiY2ZlLi4wODY1MzIzYzI3MTYgMTAwNjQ0Ci0tLSBhL2FyY2gveDg2L2tlcm5l
bC9wYXJhdmlydF9wYXRjaF8zMi5jCisrKyBiL2FyY2gveDg2L2tlcm5lbC9wYXJhdmlydF9wYXRj
aF8zMi5jCkBAIC0zNCwxNCArMzQsMTAgQEAgZXh0ZXJuIGJvb2wgcHZfaXNfbmF0aXZlX3ZjcHVf
aXNfcHJlZW1wdGVkKHZvaWQpOwogCiB1bnNpZ25lZCBuYXRpdmVfcGF0Y2godTggdHlwZSwgdm9p
ZCAqaWJ1ZiwgdW5zaWduZWQgbG9uZyBhZGRyLCB1bnNpZ25lZCBsZW4pCiB7Ci0JY29uc3QgdW5z
aWduZWQgY2hhciAqc3RhcnQsICplbmQ7Ci0JdW5zaWduZWQgcmV0OwotCiAjZGVmaW5lIFBBVENI
X1NJVEUob3BzLCB4KQkJCQkJXAotCQljYXNlIFBBUkFWSVJUX1BBVENIKG9wcy54KToJCQlcCi0J
CQlzdGFydCA9IHN0YXJ0XyMjb3BzIyNfIyN4OwkJXAotCQkJZW5kID0gZW5kXyMjb3BzIyNfIyN4
OwkJCVwKLQkJCWdvdG8gcGF0Y2hfc2l0ZQorCWNhc2UgUEFSQVZJUlRfUEFUQ0gob3BzLngpOgkJ
CQlcCisJCXJldHVybiBwYXJhdmlydF9wYXRjaF9pbnNucyhpYnVmLCBsZW4sIHN0YXJ0XyMjb3Bz
IyNfIyN4LCBlbmRfIyNvcHMjI18jI3gpCisKIAlzd2l0Y2ggKHR5cGUpIHsKICNpZmRlZiBDT05G
SUdfUEFSQVZJUlRfWFhMCiAJCVBBVENIX1NJVEUoaXJxLCBpcnFfZGlzYWJsZSk7CkBAIC01NCwz
MiArNTAsMjYgQEAgdW5zaWduZWQgbmF0aXZlX3BhdGNoKHU4IHR5cGUsIHZvaWQgKmlidWYsIHVu
c2lnbmVkIGxvbmcgYWRkciwgdW5zaWduZWQgbGVuKQogCQlQQVRDSF9TSVRFKG1tdSwgd3JpdGVf
Y3IzKTsKICNlbmRpZgogI2lmIGRlZmluZWQoQ09ORklHX1BBUkFWSVJUX1NQSU5MT0NLUykKLQkJ
Y2FzZSBQQVJBVklSVF9QQVRDSChsb2NrLnF1ZXVlZF9zcGluX3VubG9jayk6Ci0JCQlpZiAocHZf
aXNfbmF0aXZlX3NwaW5fdW5sb2NrKCkpIHsKLQkJCQlzdGFydCA9IHN0YXJ0X2xvY2tfcXVldWVk
X3NwaW5fdW5sb2NrOwotCQkJCWVuZCAgID0gZW5kX2xvY2tfcXVldWVkX3NwaW5fdW5sb2NrOwot
CQkJCWdvdG8gcGF0Y2hfc2l0ZTsKLQkJCX0KLQkJCWdvdG8gcGF0Y2hfZGVmYXVsdDsKKwljYXNl
IFBBUkFWSVJUX1BBVENIKGxvY2sucXVldWVkX3NwaW5fdW5sb2NrKToKKwkJaWYgKHB2X2lzX25h
dGl2ZV9zcGluX3VubG9jaygpKQorCQkJcmV0dXJuIHBhcmF2aXJ0X3BhdGNoX2luc25zKGlidWYs
IGxlbiwKKwkJCQkJCSAgICBzdGFydF9sb2NrX3F1ZXVlZF9zcGluX3VubG9jaywKKwkJCQkJCSAg
ICBlbmRfbG9ja19xdWV1ZWRfc3Bpbl91bmxvY2spOworCQllbHNlCisJCQlyZXR1cm4gcGFyYXZp
cnRfcGF0Y2hfZGVmYXVsdCh0eXBlLCBpYnVmLCBhZGRyLCBsZW4pOwogCi0JCWNhc2UgUEFSQVZJ
UlRfUEFUQ0gobG9jay52Y3B1X2lzX3ByZWVtcHRlZCk6Ci0JCQlpZiAocHZfaXNfbmF0aXZlX3Zj
cHVfaXNfcHJlZW1wdGVkKCkpIHsKLQkJCQlzdGFydCA9IHN0YXJ0X2xvY2tfdmNwdV9pc19wcmVl
bXB0ZWQ7Ci0JCQkJZW5kICAgPSBlbmRfbG9ja192Y3B1X2lzX3ByZWVtcHRlZDsKLQkJCQlnb3Rv
IHBhdGNoX3NpdGU7Ci0JCQl9Ci0JCQlnb3RvIHBhdGNoX2RlZmF1bHQ7CisJY2FzZSBQQVJBVklS
VF9QQVRDSChsb2NrLnZjcHVfaXNfcHJlZW1wdGVkKToKKwkJaWYgKHB2X2lzX25hdGl2ZV92Y3B1
X2lzX3ByZWVtcHRlZCgpKQorCQkJcmV0dXJuIHBhcmF2aXJ0X3BhdGNoX2luc25zKGlidWYsIGxl
biwKKwkJCQkJCSAgICBzdGFydF9sb2NrX3ZjcHVfaXNfcHJlZW1wdGVkLAorCQkJCQkJICAgIGVu
ZF9sb2NrX3ZjcHVfaXNfcHJlZW1wdGVkKTsKKwkJZWxzZQorCQkJcmV0dXJuIHBhcmF2aXJ0X3Bh
dGNoX2RlZmF1bHQodHlwZSwgaWJ1ZiwgYWRkciwgbGVuKTsKICNlbmRpZgogCiAJZGVmYXVsdDoK
LXBhdGNoX2RlZmF1bHQ6IF9fbWF5YmVfdW51c2VkCi0JCXJldCA9IHBhcmF2aXJ0X3BhdGNoX2Rl
ZmF1bHQodHlwZSwgaWJ1ZiwgYWRkciwgbGVuKTsKLQkJYnJlYWs7Ci0KLXBhdGNoX3NpdGU6Ci0J
CXJldCA9IHBhcmF2aXJ0X3BhdGNoX2luc25zKGlidWYsIGxlbiwgc3RhcnQsIGVuZCk7Ci0JCWJy
ZWFrOworCQlyZXR1cm4gcGFyYXZpcnRfcGF0Y2hfZGVmYXVsdCh0eXBlLCBpYnVmLCBhZGRyLCBs
ZW4pOwogCX0KICN1bmRlZiBQQVRDSF9TSVRFCi0JcmV0dXJuIHJldDsKKwlyZXR1cm4gMDsKIH0K
ZGlmZiAtLWdpdCBhL2FyY2gveDg2L2tlcm5lbC9wYXJhdmlydF9wYXRjaF82NC5jIGIvYXJjaC94
ODYva2VybmVsL3BhcmF2aXJ0X3BhdGNoXzY0LmMKaW5kZXggNWFkNWJjZGE5ZGM2Li4zNTQ5ZjVm
OWQ2ODUgMTAwNjQ0Ci0tLSBhL2FyY2gveDg2L2tlcm5lbC9wYXJhdmlydF9wYXRjaF82NC5jCisr
KyBiL2FyY2gveDg2L2tlcm5lbC9wYXJhdmlydF9wYXRjaF82NC5jCkBAIC00MiwxNSArNDIsMTEg
QEAgZXh0ZXJuIGJvb2wgcHZfaXNfbmF0aXZlX3ZjcHVfaXNfcHJlZW1wdGVkKHZvaWQpOwogCiB1
bnNpZ25lZCBuYXRpdmVfcGF0Y2godTggdHlwZSwgdm9pZCAqaWJ1ZiwgdW5zaWduZWQgbG9uZyBh
ZGRyLCB1bnNpZ25lZCBsZW4pCiB7Ci0JY29uc3QgdW5zaWduZWQgY2hhciAqc3RhcnQsICplbmQ7
Ci0JdW5zaWduZWQgcmV0OwotCiAjZGVmaW5lIFBBVENIX1NJVEUob3BzLCB4KQkJCQkJXAotCQlj
YXNlIFBBUkFWSVJUX1BBVENIKG9wcy54KToJCQlcCi0JCQlzdGFydCA9IHN0YXJ0XyMjb3BzIyNf
IyN4OwkJXAotCQkJZW5kID0gZW5kXyMjb3BzIyNfIyN4OwkJCVwKLQkJCWdvdG8gcGF0Y2hfc2l0
ZQotCXN3aXRjaCh0eXBlKSB7CisJY2FzZSBQQVJBVklSVF9QQVRDSChvcHMueCk6CQkJCVwKKwkJ
cmV0dXJuIHBhcmF2aXJ0X3BhdGNoX2luc25zKGlidWYsIGxlbiwgc3RhcnRfIyNvcHMjI18jI3gs
IGVuZF8jI29wcyMjXyMjeCkKKworCXN3aXRjaCAodHlwZSkgewogI2lmZGVmIENPTkZJR19QQVJB
VklSVF9YWEwKIAkJUEFUQ0hfU0lURShpcnEsIHJlc3RvcmVfZmwpOwogCQlQQVRDSF9TSVRFKGly
cSwgc2F2ZV9mbCk7CkBAIC02NCwzMiArNjAsMjcgQEAgdW5zaWduZWQgbmF0aXZlX3BhdGNoKHU4
IHR5cGUsIHZvaWQgKmlidWYsIHVuc2lnbmVkIGxvbmcgYWRkciwgdW5zaWduZWQgbGVuKQogCQlQ
QVRDSF9TSVRFKG1tdSwgd3JpdGVfY3IzKTsKICNlbmRpZgogI2lmIGRlZmluZWQoQ09ORklHX1BB
UkFWSVJUX1NQSU5MT0NLUykKLQkJY2FzZSBQQVJBVklSVF9QQVRDSChsb2NrLnF1ZXVlZF9zcGlu
X3VubG9jayk6Ci0JCQlpZiAocHZfaXNfbmF0aXZlX3NwaW5fdW5sb2NrKCkpIHsKLQkJCQlzdGFy
dCA9IHN0YXJ0X2xvY2tfcXVldWVkX3NwaW5fdW5sb2NrOwotCQkJCWVuZCAgID0gZW5kX2xvY2tf
cXVldWVkX3NwaW5fdW5sb2NrOwotCQkJCWdvdG8gcGF0Y2hfc2l0ZTsKLQkJCX0KLQkJCWdvdG8g
cGF0Y2hfZGVmYXVsdDsKKwljYXNlIFBBUkFWSVJUX1BBVENIKGxvY2sucXVldWVkX3NwaW5fdW5s
b2NrKToKKwkJaWYgKHB2X2lzX25hdGl2ZV9zcGluX3VubG9jaygpKQorCQkJcmV0dXJuIHBhcmF2
aXJ0X3BhdGNoX2luc25zKGlidWYsIGxlbiwKKwkJCQkJCSAgICBzdGFydF9sb2NrX3F1ZXVlZF9z
cGluX3VubG9jaywKKwkJCQkJCSAgICBlbmRfbG9ja19xdWV1ZWRfc3Bpbl91bmxvY2spOworCQll
bHNlCisJCQlyZXR1cm4gcGFyYXZpcnRfcGF0Y2hfZGVmYXVsdCh0eXBlLCBpYnVmLCBhZGRyLCBs
ZW4pOwogCi0JCWNhc2UgUEFSQVZJUlRfUEFUQ0gobG9jay52Y3B1X2lzX3ByZWVtcHRlZCk6Ci0J
CQlpZiAocHZfaXNfbmF0aXZlX3ZjcHVfaXNfcHJlZW1wdGVkKCkpIHsKLQkJCQlzdGFydCA9IHN0
YXJ0X2xvY2tfdmNwdV9pc19wcmVlbXB0ZWQ7Ci0JCQkJZW5kICAgPSBlbmRfbG9ja192Y3B1X2lz
X3ByZWVtcHRlZDsKLQkJCQlnb3RvIHBhdGNoX3NpdGU7Ci0JCQl9Ci0JCQlnb3RvIHBhdGNoX2Rl
ZmF1bHQ7CisJY2FzZSBQQVJBVklSVF9QQVRDSChsb2NrLnZjcHVfaXNfcHJlZW1wdGVkKToKKwkJ
aWYgKHB2X2lzX25hdGl2ZV92Y3B1X2lzX3ByZWVtcHRlZCgpKQorCQkJcmV0dXJuIHBhcmF2aXJ0
X3BhdGNoX2luc25zKGlidWYsIGxlbiwKKwkJCQkJCSAgICBzdGFydF9sb2NrX3ZjcHVfaXNfcHJl
ZW1wdGVkLAorCQkJCQkJICAgIGVuZF9sb2NrX3ZjcHVfaXNfcHJlZW1wdGVkKTsKKwkJZWxzZQor
CQkJcmV0dXJuIHBhcmF2aXJ0X3BhdGNoX2RlZmF1bHQodHlwZSwgaWJ1ZiwgYWRkciwgbGVuKTsK
ICNlbmRpZgogCiAJZGVmYXVsdDoKLXBhdGNoX2RlZmF1bHQ6IF9fbWF5YmVfdW51c2VkCi0JCXJl
dCA9IHBhcmF2aXJ0X3BhdGNoX2RlZmF1bHQodHlwZSwgaWJ1ZiwgYWRkciwgbGVuKTsKLQkJYnJl
YWs7Ci0KLXBhdGNoX3NpdGU6Ci0JCXJldCA9IHBhcmF2aXJ0X3BhdGNoX2luc25zKGlidWYsIGxl
biwgc3RhcnQsIGVuZCk7CisJCXJldHVybiBwYXJhdmlydF9wYXRjaF9kZWZhdWx0KHR5cGUsIGli
dWYsIGFkZHIsIGxlbik7CiAJCWJyZWFrOwogCX0KICN1bmRlZiBQQVRDSF9TSVRFCi0JcmV0dXJu
IHJldDsKKwlyZXR1cm4gMDsKIH0KLS0gCjIuMTcuMC41ODIuZ2NjZGNiZDU0YwoKCi0tIApSZWdh
cmRzL0dydXNzLAogICAgQm9yaXMuCgpHb29kIG1haWxpbmcgcHJhY3RpY2VzIGZvciA0MDA6IGF2
b2lkIHRvcC1wb3N0aW5nIGFuZCB0cmltIHRoZSByZXBseS4KX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX18KVmlydHVhbGl6YXRpb24gbWFpbGluZyBsaXN0ClZp
cnR1YWxpemF0aW9uQGxpc3RzLmxpbnV4LWZvdW5kYXRpb24ub3JnCmh0dHBzOi8vbGlzdHMubGlu
dXhmb3VuZGF0aW9uLm9yZy9tYWlsbWFuL2xpc3RpbmZvL3ZpcnR1YWxpemF0aW9u