From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andrew Cooper <andrew.cooper3@citrix.com>
Subject: [PATCH 05/14] x86/p2m: Don't overwrite
 p2m_altp2m_lazy_copy()'s callers p2m pointer
Date: Wed, 21 Nov 2018 13:21:13 +0000
Message-ID: <1542806482-24030-6-git-send-email-andrew.cooper3@citrix.com>
References: <1542806482-24030-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.xenproject.org>
In-Reply-To: <1542806482-24030-1-git-send-email-andrew.cooper3@citrix.com>
List-Unsubscribe: <https://lists.xenproject.org/mailman/options/xen-devel>,
 <mailto:xen-devel-request@lists.xenproject.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xenproject.org>
List-Help: <mailto:xen-devel-request@lists.xenproject.org?subject=help>
List-Subscribe: <https://lists.xenproject.org/mailman/listinfo/xen-devel>,
 <mailto:xen-devel-request@lists.xenproject.org?subject=subscribe>
Errors-To: xen-devel-bounces@lists.xenproject.org
Sender: "Xen-devel" <xen-devel-bounces@lists.xenproject.org>
To: Xen-devel <xen-devel@lists.xen.org>
Cc: Tamas K Lengyel <tamas@tklengyel.com>, Wei Liu <wei.liu2@citrix.com>, Razvan Cojocaru <rcojocaru@bitdefender.com>, George Dunlap <george.dunlap@eu.citrix.com>, Andrew Cooper <andrew.cooper3@citrix.com>, Jan Beulich <JBeulich@suse.com>, =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= <roger.pau@citrix.com>
List-Id: xen-devel@lists.xenproject.org

VGhlIGZpbmFsIHBhcmFtZXRlciB0byBwMm1fYWx0cDJtX2xhenlfY29weSgpIGFwcGVhcnMgdG8g
YmUgdW5uZWNlc3NhcnksIGFuZApyZXN1bHRzIGluIHZlcnkgaGFyZC10by1mb2xsb3cgY29kZS4g
IEhhdmUgdGhlIHNvbGUgY2FsbGVyIHNldCBpdHMgbG9jYWwgcDJtCnBvaW50ZXIgYXBwcm9wcmlh
dGVseSwgYW5kIGRyb3AgdGhlIHBhcmFtZXRlci4KCldpdGggdGhhdCBkb25lLCBhIGxldmVsIG9m
IGluZGlyZWN0aW9uIG9mIGFwMm0gY2FuIGJlIGRyb3BwZWQgaW5zaWRlCnAybV9hbHRwMm1fbGF6
eV9jb3B5KCkuICBXaGlsZSBjaGFuZ2luZyB0aGUgQVBJLCBzd2l0Y2ggaXQgZnJvbSBib29sX3Qg
dG8KYm9vbCwgYW5kIGRyb3AgcHJpbnRpbmcgb2YgdGhlIGFsdHAybSdzIHZpcnR1YWwgYWRkcmVz
cywgYmVjYXVzZSBpdCBpcyBvZiBubwp1c2UgZXZlbiB3aGVuIGRlYnVnZ2luZy4KCk5vIChpbnRl
bmRlZCkgb3ZlcmFsbCBjaGFuZ2UgaW4gYmVoYXZpb3VyLgoKU2lnbmVkLW9mZi1ieTogQW5kcmV3
IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4KLS0KQ0M6IEphbiBCZXVsaWNoIDxK
QmV1bGljaEBzdXNlLmNvbT4KQ0M6IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+CkNDOiBS
b2dlciBQYXUgTW9ubsOpIDxyb2dlci5wYXVAY2l0cml4LmNvbT4KQ0M6IFJhenZhbiBDb2pvY2Fy
dSA8cmNvam9jYXJ1QGJpdGRlZmVuZGVyLmNvbT4KQ0M6IFRhbWFzIEsgTGVuZ3llbCA8dGFtYXNA
dGtsZW5neWVsLmNvbT4KQ0M6IEdlb3JnZSBEdW5sYXAgPGdlb3JnZS5kdW5sYXBAZXUuY2l0cml4
LmNvbT4KLS0tCiB4ZW4vYXJjaC94ODYvaHZtL2h2bS5jICAgIHwgIDQgKysrLQogeGVuL2FyY2gv
eDg2L21tL3AybS5jICAgICB8IDI0ICsrKysrKysrKysrKy0tLS0tLS0tLS0tLQogeGVuL2luY2x1
ZGUvYXNtLXg4Ni9wMm0uaCB8ICA0ICsrLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTcgaW5zZXJ0aW9u
cygrKSwgMTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L2h2bS9odm0u
YyBiL3hlbi9hcmNoL3g4Ni9odm0vaHZtLmMKaW5kZXggZTJlNDIwNC4uOTRmZTQ0MSAxMDA2NDQK
LS0tIGEveGVuL2FyY2gveDg2L2h2bS9odm0uYworKysgYi94ZW4vYXJjaC94ODYvaHZtL2h2bS5j
CkBAIC0xNzYwLDcgKzE3NjAsOSBAQCBpbnQgaHZtX2hhcF9uZXN0ZWRfcGFnZV9mYXVsdChwYWRk
cl90IGdwYSwgdW5zaWduZWQgbG9uZyBnbGEsCiAKICAgICBpZiAoIGFwMm1fYWN0aXZlICkKICAg
ICB7Ci0gICAgICAgIGlmICggcDJtX2FsdHAybV9sYXp5X2NvcHkoY3VyciwgZ3BhLCBnbGEsIG5w
ZmVjLCAmcDJtKSApCisgICAgICAgIHAybSA9IHAybV9nZXRfYWx0cDJtKGN1cnIpOworCisgICAg
ICAgIGlmICggcDJtX2FsdHAybV9sYXp5X2NvcHkoY3VyciwgZ3BhLCBnbGEsIG5wZmVjKSApCiAg
ICAgICAgIHsKICAgICAgICAgICAgIC8qIGVudHJ5IHdhcyBsYXppbHkgY29waWVkIGZyb20gaG9z
dCAtLSByZXRyeSAqLwogICAgICAgICAgICAgX19wdXRfZ2ZuKGhvc3RwMm0sIGdmbik7CmRpZmYg
LS1naXQgYS94ZW4vYXJjaC94ODYvbW0vcDJtLmMgYi94ZW4vYXJjaC94ODYvbW0vcDJtLmMKaW5k
ZXggYWU5Y2IyMC4uOGI5ODk4YSAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21tL3AybS5jCisr
KyBiL3hlbi9hcmNoL3g4Ni9tbS9wMm0uYwpAQCAtMjE3MiwyMyArMjE3MiwyMyBAQCBib29sX3Qg
cDJtX3N3aXRjaF92Y3B1X2FsdHAybV9ieV9pZChzdHJ1Y3QgdmNwdSAqdiwgdW5zaWduZWQgaW50
IGlkeCkKICAqICAgICBpbmRpY2F0ZSB0aGF0IG91dGVyIGhhbmRsZXIgc2hvdWxkIGhhbmRsZSBm
YXVsdAogICovCiAKLWJvb2xfdCBwMm1fYWx0cDJtX2xhenlfY29weShzdHJ1Y3QgdmNwdSAqdiwg
cGFkZHJfdCBncGEsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBn
bGEsIHN0cnVjdCBucGZlYyBucGZlYywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdHJ1
Y3QgcDJtX2RvbWFpbiAqKmFwMm0pCitib29sIHAybV9hbHRwMm1fbGF6eV9jb3B5KHN0cnVjdCB2
Y3B1ICp2LCBwYWRkcl90IGdwYSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQg
bG9uZyBnbGEsIHN0cnVjdCBucGZlYyBucGZlYykKIHsKICAgICBzdHJ1Y3QgcDJtX2RvbWFpbiAq
aHAybSA9IHAybV9nZXRfaG9zdHAybSh2LT5kb21haW4pOworICAgIHN0cnVjdCBwMm1fZG9tYWlu
ICphcDJtID0gcDJtX2dldF9hbHRwMm0odik7CiAgICAgcDJtX3R5cGVfdCBwMm10OwogICAgIHAy
bV9hY2Nlc3NfdCBwMm1hOwogICAgIHVuc2lnbmVkIGludCBwYWdlX29yZGVyOwotICAgIGdmbl90
IGdmbiA9IF9nZm4ocGFkZHJfdG9fcGZuKGdwYSkpOworICAgIGdmbl90IGdmbiA9IGdhZGRyX3Rv
X2dmbihncGEpOwogICAgIHVuc2lnbmVkIGxvbmcgbWFzazsKICAgICBtZm5fdCBtZm47CiAgICAg
aW50IHJ2OwogICAgIGJvb2wgcmV0OwogCi0gICAgKmFwMm0gPSBwMm1fZ2V0X2FsdHAybSh2KTsK
KyAgICBBU1NFUlQocDJtX2xvY2tlZF9ieV9tZShocDJtKSk7CiAKLSAgICBtZm4gPSBnZXRfZ2Zu
X3R5cGVfYWNjZXNzKCphcDJtLCBnZm5feChnZm4pLCAmcDJtdCwgJnAybWEsCisgICAgbWZuID0g
Z2V0X2dmbl90eXBlX2FjY2VzcyhhcDJtLCBnZm5feChnZm4pLCAmcDJtdCwgJnAybWEsCiAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAwLCAmcGFnZV9vcmRlcik7CiAKICAgICAvKiBFbnRy
eSBhbHJlYWR5IHByZXNlbnQgaW4gYXAybT8gIENhbGxlciBzaG91bGQgaGFuZGxlIHRoZSBmYXVs
dC4gKi8KQEAgLTIyMTYsMTUgKzIyMTYsMTUgQEAgYm9vbF90IHAybV9hbHRwMm1fbGF6eV9jb3B5
KHN0cnVjdCB2Y3B1ICp2LCBwYWRkcl90IGdwYSwKICAgICBtZm4gPSBfbWZuKG1mbl94KG1mbikg
JiBtYXNrKTsKICAgICBnZm4gPSBfZ2ZuKGdmbl94KGdmbikgJiBtYXNrKTsKIAotICAgIHAybV9s
b2NrKCphcDJtKTsKLSAgICBydiA9IHAybV9zZXRfZW50cnkoKmFwMm0sIGdmbiwgbWZuLCBwYWdl
X29yZGVyLCBwMm10LCBwMm1hKTsKLSAgICBwMm1fdW5sb2NrKCphcDJtKTsKKyAgICBwMm1fbG9j
ayhhcDJtKTsKKyAgICBydiA9IHAybV9zZXRfZW50cnkoYXAybSwgZ2ZuLCBtZm4sIHBhZ2Vfb3Jk
ZXIsIHAybXQsIHAybWEpOworICAgIHAybV91bmxvY2soYXAybSk7CiAKICAgICBpZiAoIHJ2ICkK
ICAgICB7CiAgICAgICAgIGdkcHJpbnRrKFhFTkxPR19FUlIsCi0JICAgICJmYWlsZWQgdG8gc2V0
IGVudHJ5IGZvciAlIyJQUkl4NjQiIC0+ICUjIlBSSXg2NCIgcDJtICUjIlBSSXg2NCJcbiIsCi0J
ICAgIGdmbl94KGdmbiksIG1mbl94KG1mbiksICh1bnNpZ25lZCBsb25nKSphcDJtKTsKKwkgICAg
ImZhaWxlZCB0byBzZXQgZW50cnkgZm9yICUjIlBSSXg2NCIgLT4gJSMiUFJJeDY0IlxuIiwKKwkg
ICAgZ2ZuX3goZ2ZuKSwgbWZuX3gobWZuKSk7CiAgICAgICAgIGRvbWFpbl9jcmFzaChocDJtLT5k
b21haW4pOwogICAgIH0KIApAQCAtMjIzMyw3ICsyMjMzLDcgQEAgYm9vbF90IHAybV9hbHRwMm1f
bGF6eV9jb3B5KHN0cnVjdCB2Y3B1ICp2LCBwYWRkcl90IGdwYSwKIHB1dF9ocDJtOgogICAgIF9f
cHV0X2dmbihocDJtLCBnZm5feChnZm4pKTsKIHB1dF9hcDJtOgotICAgIF9fcHV0X2dmbigqYXAy
bSwgZ2ZuX3goZ2ZuKSk7CisgICAgX19wdXRfZ2ZuKGFwMm0sIGdmbl94KGdmbikpOwogCiAgICAg
cmV0dXJuIHJldDsKIH0KZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL2FzbS14ODYvcDJtLmggYi94
ZW4vaW5jbHVkZS9hc20teDg2L3AybS5oCmluZGV4IDZkODQ5YTUuLjA0YzIxMDQgMTAwNjQ0Ci0t
LSBhL3hlbi9pbmNsdWRlL2FzbS14ODYvcDJtLmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9w
Mm0uaApAQCAtODY4LDggKzg2OCw4IEBAIHZvaWQgcDJtX2FsdHAybV9jaGVjayhzdHJ1Y3QgdmNw
dSAqdiwgdWludDE2X3QgaWR4KTsKIHZvaWQgcDJtX2ZsdXNoX2FsdHAybShzdHJ1Y3QgZG9tYWlu
ICpkKTsKIAogLyogQWx0ZXJuYXRlIHAybSBwYWdpbmcgKi8KLWJvb2xfdCBwMm1fYWx0cDJtX2xh
enlfY29weShzdHJ1Y3QgdmNwdSAqdiwgcGFkZHJfdCBncGEsCi0gICAgdW5zaWduZWQgbG9uZyBn
bGEsIHN0cnVjdCBucGZlYyBucGZlYywgc3RydWN0IHAybV9kb21haW4gKiphcDJtKTsKK2Jvb2wg
cDJtX2FsdHAybV9sYXp5X2NvcHkoc3RydWN0IHZjcHUgKnYsIHBhZGRyX3QgZ3BhLAorICAgICAg
ICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIGdsYSwgc3RydWN0IG5wZmVjIG5wZmVj
KTsKIAogLyogTWFrZSBhIHNwZWNpZmljIGFsdGVybmF0ZSBwMm0gdmFsaWQgKi8KIGludCBwMm1f
aW5pdF9hbHRwMm1fYnlfaWQoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgaW50IGlkeCk7Ci0t
IAoyLjEuNAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
Clhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0
dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=