From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Jan Beulich" Subject: [PATCH v2 1/2] x86: reduce code duplication in guest_remove_page() Date: Wed, 05 Dec 2018 09:17:02 -0700 Message-ID: <5C07F9FE020000780020336A@prv1-mh.provo.novell.com> References: <5BF4328902000078001FE240@prv1-mh.provo.novell.com> <5C07F95A0200007800203354@prv1-mh.provo.novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gUZrI-0004NN-69 for xen-devel@lists.xenproject.org; Wed, 05 Dec 2018 16:17:08 +0000 In-Reply-To: <5C07F95A0200007800203354@prv1-mh.provo.novell.com> Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel Cc: Stefano Stabellini , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , Julien Grall List-Id: xen-devel@lists.xenproject.org UXVpdGUgYSBiaXQgb2YgZHVwbGljYXRlIGNvZGUgaGFzIGFjY3VtdWxhdGVkIG9uIHRoZSAicGFn aW5nIiB0eXBlcwpzcGVjaWFsIGNhc2UgcGF0aC4gUmUtdXNlIHdoYXQgY2FuIGJlIHJlLXVzZWQg ZnJvbSB0aGUgY29tbW9uIHBhdGguCgpTaW5jZSBpdCBuZWVkcyB0b3VjaGluZyBhbnl3YXksIHNs aWdodGx5IHJlLWZvcm1hdCBhbmQgZXh0ZW5kIHRoZQpnZHByaW50aygpIG9uIHRoZSBjb21tb24g cGF0aCBhcyB3ZWxsLgoKU2lnbmVkLW9mZi1ieTogSmFuIEJldWxpY2ggPGpiZXVsaWNoQHN1c2Uu Y29tPgotLS0KdjI6IFJlLWJhc2UuCgotLS0gYS94ZW4vY29tbW9uL21lbW9yeS5jCisrKyBiL3hl bi9jb21tb24vbWVtb3J5LmMKQEAgLTMyMCwzMCArMzIwLDE1IEBAIGludCBndWVzdF9yZW1vdmVf cGFnZShzdHJ1Y3QgZG9tYWluICpkLAogICAgICAgICBpZiAoIHAybXQgPT0gcDJtX3JhbV9wYWdp bmdfb3V0ICkKICAgICAgICAgewogICAgICAgICAgICAgQVNTRVJUKG1mbl92YWxpZChtZm4pKTsK LSAgICAgICAgICAgIHBhZ2UgPSBtZm5fdG9fcGFnZShtZm4pOwotICAgICAgICAgICAgcmMgPSAt RU5YSU87Ci0gICAgICAgICAgICBpZiAoICFnZXRfcGFnZShwYWdlLCBkKSApCi0gICAgICAgICAg ICAgICAgZ290byBvdXRfcHV0X2dmbjsKKyAgICAgICAgICAgIGdvdG8gb2J0YWluX3BhZ2U7CiAg ICAgICAgIH0KLSAgICAgICAgZWxzZQotICAgICAgICAgICAgcGFnZSA9IE5VTEw7CiAKICAgICAg ICAgcmMgPSBndWVzdF9waHlzbWFwX3JlbW92ZV9wYWdlKGQsIF9nZm4oZ21mbiksIG1mbiwgMCk7 CiAgICAgICAgIGlmICggcmMgKQotICAgICAgICB7Ci0gICAgICAgICAgICBpZiAoIHBhZ2UgKQot ICAgICAgICAgICAgICAgIHB1dF9wYWdlKHBhZ2UpOwogICAgICAgICAgICAgZ290byBvdXRfcHV0 X2dmbjsKLSAgICAgICAgfQogCiAgICAgICAgIHB1dF9nZm4oZCwgZ21mbik7CiAKLSAgICAgICAg aWYgKCBwYWdlICkKLSAgICAgICAgewotICAgICAgICAgICAgaWYgKCB0ZXN0X2FuZF9jbGVhcl9i aXQoX1BHQ19hbGxvY2F0ZWQsICZwYWdlLT5jb3VudF9pbmZvKSApCi0gICAgICAgICAgICAgICAg cHV0X3BhZ2UocGFnZSk7Ci0gICAgICAgICAgICBwdXRfcGFnZShwYWdlKTsKLSAgICAgICAgfQog ICAgICAgICBwMm1fbWVtX3BhZ2luZ19kcm9wX3BhZ2UoZCwgZ21mbiwgcDJtdCk7CiAKICAgICAg ICAgcmV0dXJuIDA7CkBAIC0zODcsMTMgKzM3MiwxNiBAQCBpbnQgZ3Vlc3RfcmVtb3ZlX3BhZ2Uo c3RydWN0IGRvbWFpbiAqZCwKICAgICB9CiAjZW5kaWYgLyogQ09ORklHX1g4NiAqLwogCisgb2J0 YWluX3BhZ2U6IF9fbWF5YmVfdW51c2VkOwogICAgIHBhZ2UgPSBtZm5fdG9fcGFnZShtZm4pOwog ICAgIGlmICggdW5saWtlbHkoIWdldF9wYWdlKHBhZ2UsIGQpKSApCiAgICAgewogI2lmZGVmIENP TkZJR19YODYKICAgICAgICAgcHV0X2dmbihkLCBnbWZuKTsKKyAgICAgICAgaWYgKCAhcDJtX2lz X3BhZ2luZyhwMm10KSApCiAjZW5kaWYKLSAgICAgICAgZ2RwcmludGsoWEVOTE9HX0lORk8sICJC YWQgcGFnZSBmcmVlIGZvciBkb21haW4gJXVcbiIsIGQtPmRvbWFpbl9pZCk7CisgICAgICAgICAg ICBnZHByaW50ayhYRU5MT0dfSU5GTywgIkJhZCBwYWdlIGZyZWUgZm9yIERvbSV1IEdGTiAlbHhc biIsCisgICAgICAgICAgICAgICAgICAgICBkLT5kb21haW5faWQsIGdtZm4pOwogCiAgICAgICAg IHJldHVybiAtRU5YSU87CiAgICAgfQoKCgoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3Rz LnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0 aW5mby94ZW4tZGV2ZWw=