From mboxrd@z Thu Jan 1 00:00:00 1970 From: Igor Druzhinin Subject: [PATCH v3 4/4] xen: don't use xenstore to save/restore physmap anymore Date: Mon, 10 Jul 2017 23:40:03 +0100 Message-ID: <1499726403-10129-5-git-send-email-igor.druzhinin@citrix.com> References: <1499726403-10129-1-git-send-email-igor.druzhinin@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dUhM3-0007BC-12 for xen-devel@lists.xenproject.org; Mon, 10 Jul 2017 22:40:35 +0000 In-Reply-To: <1499726403-10129-1-git-send-email-igor.druzhinin@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org, qemu-devel@nongnu.org Cc: anthony.perard@citrix.com, Igor Druzhinin , sstabellini@kernel.org, paul.durrant@citrix.com, pbonzini@redhat.com List-Id: xen-devel@lists.xenproject.org SWYgd2UgaGF2ZSBhIHN5c3RlbSB3aXRoIHhlbmZvcmVpZ25tZW1vcnlfbWFwMigpIGltcGxlbWVu dGVkCndlIGRvbid0IG5lZWQgdG8gc2F2ZS9yZXN0b3JlIHBoeXNtYXAgb24gc3VzcGVuZC9yZXN0 b3JlCmFueW1vcmUuIEluIGNhc2Ugd2UgcmVzdW1lIGEgVk0gd2l0aG91dCBwaHlzbWFwIC0gdHJ5 IHRvCnJlY3JlYXRlIHRoZSBwaHlzbWFwIGR1cmluZyBtZW1vcnkgcmVnaW9uIHJlc3RvcmUgcGhh c2UgYW5kCnJlbWFwIG1hcCBjYWNoZSBlbnRyaWVzIGFjY29yZGluZ2x5LiBUaGUgb2xkIGNvZGUg aXMgbGVmdApmb3IgY29tcGF0aWJpbGl0eSByZWFzb25zLgoKU2lnbmVkLW9mZi1ieTogSWdvciBE cnV6aGluaW4gPGlnb3IuZHJ1emhpbmluQGNpdHJpeC5jb20+Ci0tLQogaHcvaTM4Ni94ZW4veGVu LWh2bS5jICAgICAgIHwgNDggKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0t LS0tLS0tCiBody9pMzg2L3hlbi94ZW4tbWFwY2FjaGUuYyAgfCAgNCArKysrCiBpbmNsdWRlL2h3 L3hlbi94ZW5fY29tbW9uLmggfCAgMSArCiAzIGZpbGVzIGNoYW5nZWQsIDQyIGluc2VydGlvbnMo KyksIDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2h3L2kzODYveGVuL3hlbi1odm0uYyBi L2h3L2kzODYveGVuL3hlbi1odm0uYwppbmRleCBkMjU5Y2Y3Li5kMjRjYTQ3IDEwMDY0NAotLS0g YS9ody9pMzg2L3hlbi94ZW4taHZtLmMKKysrIGIvaHcvaTM4Ni94ZW4veGVuLWh2bS5jCkBAIC0y ODksNiArMjg5LDcgQEAgc3RhdGljIFhlblBoeXNtYXAgKmdldF9waHlzbWFwcGluZyhYZW5JT1N0 YXRlICpzdGF0ZSwKICAgICByZXR1cm4gTlVMTDsKIH0KIAorI2lmZGVmIFhFTl9DT01QQVRfUEhZ U01BUAogc3RhdGljIGh3YWRkciB4ZW5fcGh5c19vZmZzZXRfdG9fZ2FkZHIoaHdhZGRyIHN0YXJ0 X2FkZHIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICByYW1fYWRkcl90IHNpemUsIHZvaWQgKm9wYXF1ZSkKIHsKQEAgLTMzNCw2ICszMzUsMTIgQEAg c3RhdGljIGludCB4ZW5fc2F2ZV9waHlzbWFwKFhlbklPU3RhdGUgKnN0YXRlLCBYZW5QaHlzbWFw ICpwaHlzbWFwKQogICAgIH0KICAgICByZXR1cm4gMDsKIH0KKyNlbHNlCitzdGF0aWMgaW50IHhl bl9zYXZlX3BoeXNtYXAoWGVuSU9TdGF0ZSAqc3RhdGUsIFhlblBoeXNtYXAgKnBoeXNtYXApCit7 CisgICAgcmV0dXJuIDA7Cit9CisjZW5kaWYKIAogc3RhdGljIGludCB4ZW5fYWRkX3RvX3BoeXNt YXAoWGVuSU9TdGF0ZSAqc3RhdGUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBod2Fk ZHIgc3RhcnRfYWRkciwKQEAgLTM2OCw2ICszNzUsMjYgQEAgZ29fcGh5c21hcDoKICAgICBEUFJJ TlRGKCJtYXBwaW5nIHZyYW0gdG8gJSJIV0FERFJfUFJJeCIgLSAlIkhXQUREUl9QUkl4IlxuIiwK ICAgICAgICAgICAgIHN0YXJ0X2FkZHIsIHN0YXJ0X2FkZHIgKyBzaXplKTsKIAorICAgIG1yX25h bWUgPSBtZW1vcnlfcmVnaW9uX25hbWUobXIpOworCisgICAgcGh5c21hcCA9IGdfbWFsbG9jKHNp emVvZiAoWGVuUGh5c21hcCkpOworCisgICAgcGh5c21hcC0+c3RhcnRfYWRkciA9IHN0YXJ0X2Fk ZHI7CisgICAgcGh5c21hcC0+c2l6ZSA9IHNpemU7CisgICAgcGh5c21hcC0+bmFtZSA9IG1yX25h bWU7CisgICAgcGh5c21hcC0+cGh5c19vZmZzZXQgPSBwaHlzX29mZnNldDsKKworICAgIFFMSVNU X0lOU0VSVF9IRUFEKCZzdGF0ZS0+cGh5c21hcCwgcGh5c21hcCwgbGlzdCk7CisKKyAgICBpZiAo cnVuc3RhdGVfY2hlY2soUlVOX1NUQVRFX0lOTUlHUkFURSkpIHsKKyAgICAgICAgLyogTm93IHdo ZW4gd2UgaGF2ZSBhIHBoeXNtYXAgZW50cnkgd2UgY2FuIHJlcGxhY2UgYSBkdW1teSBtYXBwaW5n IHdpdGgKKyAgICAgICAgICogYSByZWFsIG9uZSBvZiBndWVzdCBmb3JlaWduIG1lbW9yeS4gKi8K KyAgICAgICAgdWludDhfdCAqcCA9IHhlbl9yZXBsYWNlX2NhY2hlX2VudHJ5KHBoeXNfb2Zmc2V0 LCBzdGFydF9hZGRyLCBzaXplKTsKKyAgICAgICAgYXNzZXJ0KHAgJiYgcCA9PSBtZW1vcnlfcmVn aW9uX2dldF9yYW1fcHRyKG1yKSk7CisKKyAgICAgICAgcmV0dXJuIDA7CisgICAgfQorCiAgICAg cGZuID0gcGh5c19vZmZzZXQgPj4gVEFSR0VUX1BBR0VfQklUUzsKICAgICBzdGFydF9ncGZuID0g c3RhcnRfYWRkciA+PiBUQVJHRVRfUEFHRV9CSVRTOwogICAgIGZvciAoaSA9IDA7IGkgPCBzaXpl ID4+IFRBUkdFVF9QQUdFX0JJVFM7IGkrKykgewpAQCAtMzgyLDE3ICs0MDksNiBAQCBnb19waHlz bWFwOgogICAgICAgICB9CiAgICAgfQogCi0gICAgbXJfbmFtZSA9IG1lbW9yeV9yZWdpb25fbmFt ZShtcik7Ci0KLSAgICBwaHlzbWFwID0gZ19tYWxsb2Moc2l6ZW9mIChYZW5QaHlzbWFwKSk7Ci0K LSAgICBwaHlzbWFwLT5zdGFydF9hZGRyID0gc3RhcnRfYWRkcjsKLSAgICBwaHlzbWFwLT5zaXpl ID0gc2l6ZTsKLSAgICBwaHlzbWFwLT5uYW1lID0gbXJfbmFtZTsKLSAgICBwaHlzbWFwLT5waHlz X29mZnNldCA9IHBoeXNfb2Zmc2V0OwotCi0gICAgUUxJU1RfSU5TRVJUX0hFQUQoJnN0YXRlLT5w aHlzbWFwLCBwaHlzbWFwLCBsaXN0KTsKLQogICAgIHhjX2RvbWFpbl9waW5fbWVtb3J5X2NhY2hl YXR0cih4ZW5feGMsIHhlbl9kb21pZCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgc3RhcnRfYWRkciA+PiBUQVJHRVRfUEFHRV9CSVRTLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAoc3RhcnRfYWRkciArIHNpemUgLSAxKSA+PiBUQVJHRVRfUEFHRV9CSVRT LApAQCAtMTE1OCw2ICsxMTc0LDcgQEAgc3RhdGljIHZvaWQgeGVuX2V4aXRfbm90aWZpZXIoTm90 aWZpZXIgKm4sIHZvaWQgKmRhdGEpCiAgICAgeHNfZGFlbW9uX2Nsb3NlKHN0YXRlLT54ZW5zdG9y ZSk7CiB9CiAKKyNpZmRlZiBYRU5fQ09NUEFUX1BIWVNNQVAKIHN0YXRpYyB2b2lkIHhlbl9yZWFk X3BoeXNtYXAoWGVuSU9TdGF0ZSAqc3RhdGUpCiB7CiAgICAgWGVuUGh5c21hcCAqcGh5c21hcCA9 IE5VTEw7CkBAIC0xMjA1LDYgKzEyMjIsMTEgQEAgc3RhdGljIHZvaWQgeGVuX3JlYWRfcGh5c21h cChYZW5JT1N0YXRlICpzdGF0ZSkKICAgICB9CiAgICAgZnJlZShlbnRyaWVzKTsKIH0KKyNlbHNl CitzdGF0aWMgdm9pZCB4ZW5fcmVhZF9waHlzbWFwKFhlbklPU3RhdGUgKnN0YXRlKQoreworfQor I2VuZGlmCiAKIHN0YXRpYyB2b2lkIHhlbl93YWtldXBfbm90aWZpZXIoTm90aWZpZXIgKm5vdGlm aWVyLCB2b2lkICpkYXRhKQogewpAQCAtMTMzMSw3ICsxMzUzLDExIEBAIHZvaWQgeGVuX2h2bV9p bml0KFBDTWFjaGluZVN0YXRlICpwY21zLCBNZW1vcnlSZWdpb24gKipyYW1fbWVtb3J5KQogICAg IHN0YXRlLT5idWZpb3JlcV9sb2NhbF9wb3J0ID0gcmM7CiAKICAgICAvKiBJbml0IFJBTSBtYW5h Z2VtZW50ICovCisjaWZkZWYgWEVOX0NPTVBBVF9QSFlTTUFQCiAgICAgeGVuX21hcF9jYWNoZV9p bml0KHhlbl9waHlzX29mZnNldF90b19nYWRkciwgc3RhdGUpOworI2Vsc2UKKyAgICB4ZW5fbWFw X2NhY2hlX2luaXQoTlVMTCwgc3RhdGUpOworI2VuZGlmCiAgICAgeGVuX3JhbV9pbml0KHBjbXMs IHJhbV9zaXplLCByYW1fbWVtb3J5KTsKIAogICAgIHFlbXVfYWRkX3ZtX2NoYW5nZV9zdGF0ZV9o YW5kbGVyKHhlbl9odm1fY2hhbmdlX3N0YXRlX2hhbmRsZXIsIHN0YXRlKTsKZGlmZiAtLWdpdCBh L2h3L2kzODYveGVuL3hlbi1tYXBjYWNoZS5jIGIvaHcvaTM4Ni94ZW4veGVuLW1hcGNhY2hlLmMK aW5kZXggOGJjNjNlMC4uODRjYzRhMiAxMDA2NDQKLS0tIGEvaHcvaTM4Ni94ZW4veGVuLW1hcGNh Y2hlLmMKKysrIGIvaHcvaTM4Ni94ZW4veGVuLW1hcGNhY2hlLmMKQEAgLTIzOSw3ICsyMzksOSBA QCBzdGF0aWMgdWludDhfdCAqeGVuX21hcF9jYWNoZV91bmxvY2tlZChod2FkZHIgcGh5c19hZGRy LCBod2FkZHIgc2l6ZSwKICAgICBod2FkZHIgYWRkcmVzc19vZmZzZXQ7CiAgICAgaHdhZGRyIGNh Y2hlX3NpemUgPSBzaXplOwogICAgIGh3YWRkciB0ZXN0X2JpdF9zaXplOworI2lmZGVmIFhFTl9D T01QQVRfUEhZU01BUAogICAgIGJvb2wgdHJhbnNsYXRlZCA9IGZhbHNlOworI2VuZGlmCiAgICAg Ym9vbCBkdW1teSA9IGZhbHNlOwogCiB0cnlhZ2FpbjoKQEAgLTMwNywxMSArMzA5LDEzIEBAIHRy eWFnYWluOgogICAgICAgICAgICAgICAgIHRlc3RfYml0X3NpemUgPj4gWENfUEFHRV9TSElGVCwK ICAgICAgICAgICAgICAgICBlbnRyeS0+dmFsaWRfbWFwcGluZykpIHsKICAgICAgICAgbWFwY2Fj aGUtPmxhc3RfZW50cnkgPSBOVUxMOworI2lmZGVmIFhFTl9DT01QQVRfUEhZU01BUAogICAgICAg ICBpZiAoIXRyYW5zbGF0ZWQgJiYgbWFwY2FjaGUtPnBoeXNfb2Zmc2V0X3RvX2dhZGRyKSB7CiAg ICAgICAgICAgICBwaHlzX2FkZHIgPSBtYXBjYWNoZS0+cGh5c19vZmZzZXRfdG9fZ2FkZHIocGh5 c19hZGRyLCBzaXplLCBtYXBjYWNoZS0+b3BhcXVlKTsKICAgICAgICAgICAgIHRyYW5zbGF0ZWQg PSB0cnVlOwogICAgICAgICAgICAgZ290byB0cnlhZ2FpbjsKICAgICAgICAgfQorI2VuZGlmCiAg ICAgICAgIGlmICghZHVtbXkgJiYgcnVuc3RhdGVfY2hlY2soUlVOX1NUQVRFX0lOTUlHUkFURSkp IHsKICAgICAgICAgICAgIGR1bW15ID0gdHJ1ZTsKICAgICAgICAgICAgIGdvdG8gdHJ5YWdhaW47 CmRpZmYgLS1naXQgYS9pbmNsdWRlL2h3L3hlbi94ZW5fY29tbW9uLmggYi9pbmNsdWRlL2h3L3hl bi94ZW5fY29tbW9uLmgKaW5kZXggZTI4ZWQ0OC4uODZjN2YyNiAxMDA2NDQKLS0tIGEvaW5jbHVk ZS9ody94ZW4veGVuX2NvbW1vbi5oCisrKyBiL2luY2x1ZGUvaHcveGVuL3hlbl9jb21tb24uaApA QCAtODAsNiArODAsNyBAQCBleHRlcm4geGVuZm9yZWlnbm1lbW9yeV9oYW5kbGUgKnhlbl9mbWVt OwogCiAjaWYgQ09ORklHX1hFTl9DVFJMX0lOVEVSRkFDRV9WRVJTSU9OIDwgNDEwMDAKIAorI2Rl ZmluZSBYRU5fQ09NUEFUX1BIWVNNQVAKIHN0YXRpYyBpbmxpbmUgdm9pZCAqeGVuZm9yZWlnbm1l bW9yeV9tYXAyKHhlbmZvcmVpZ25tZW1vcnlfaGFuZGxlICpoLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgZG9tLCB2b2lkICphZGRyLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IHByb3QsIGludCBmbGFncywg c2l6ZV90IHBhZ2VzLAotLSAKMi43LjQKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54 ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK