From mboxrd@z Thu Jan 1 00:00:00 1970 From: Juergen Gross Subject: [PATCH v2 4/5] xenstore: add explicit memory context parameter to get_node() Date: Mon, 18 Jul 2016 09:31:28 +0200 Message-ID: <1468827089-9054-5-git-send-email-jgross@suse.com> References: <1468827089-9054-1-git-send-email-jgross@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1468827089-9054-1-git-send-email-jgross@suse.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xen.org Cc: Juergen Gross , wei.liu2@citrix.com, ian.jackson@eu.citrix.com List-Id: xen-devel@lists.xenproject.org QWRkIGEgcGFyYW1ldGVyIHRvIHhlbnN0b3JlZCBnZXRfbm9kZSgpIGZ1bmN0aW9uIHRvIGV4cGxp Y2l0bHkKc3BlY2lmeSB0aGUgbWVtb3J5IGNvbnRleHQgdG8gYmUgdXNlZCBmb3IgYWxsb2NhdGlv bnMuIFRoaXMgd2lsbCBtYWtlCml0IGVhc2llciB0byBhdm9pZCBtZW1vcnkgbGVha3MgYnkgdXNp bmcgYSBjb250ZXh0IHdoaWNoIGlzIGZyZWVkCnNvb24uCgpUaGlzIHJlcXVpcmVzIGFkZGluZyB0 aGUgdGVtcG9yYXJ5IGNvbnRleHQgdG8gZXJybm9fZnJvbV9wYXJlbnRzKCkgYW5kCmFza19wYXJl bnRzKCksIHRvby4KCldoZW4gY2FsbGluZyBnZXRfbm9kZSgpIHNlbGVjdCBhIHNlbnNpYmxlIG1l bW9yeSBjb250ZXh0IGZvciB0aGUgbmV3CnBhcmFtZXRlciBieSBwcmVmZXJyaW5nIGEgdGVtcG9y YXJ5IG9uZS4KClNpZ25lZC1vZmYtYnk6IEp1ZXJnZW4gR3Jvc3MgPGpncm9zc0BzdXNlLmNvbT4K LS0tCiB0b29scy94ZW5zdG9yZS94ZW5zdG9yZWRfY29yZS5jICB8IDMzICsrKysrKysrKysrKysr KysrKy0tLS0tLS0tLS0tLS0tLQogdG9vbHMveGVuc3RvcmUveGVuc3RvcmVkX2NvcmUuaCAgfCAg MSArCiB0b29scy94ZW5zdG9yZS94ZW5zdG9yZWRfd2F0Y2guYyB8ICAyICstCiAzIGZpbGVzIGNo YW5nZWQsIDIwIGluc2VydGlvbnMoKyksIDE2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rv b2xzL3hlbnN0b3JlL3hlbnN0b3JlZF9jb3JlLmMgYi90b29scy94ZW5zdG9yZS94ZW5zdG9yZWRf Y29yZS5jCmluZGV4IGU1Yzc0ZjQuLjA5NWJhMDAgMTAwNjQ0Ci0tLSBhL3Rvb2xzL3hlbnN0b3Jl L3hlbnN0b3JlZF9jb3JlLmMKKysrIGIvdG9vbHMveGVuc3RvcmUveGVuc3RvcmVkX2NvcmUuYwpA QCAtNTE3LDEzICs1MTcsMTQgQEAgc3RhdGljIGNoYXIgKmdldF9wYXJlbnQoY29uc3Qgdm9pZCAq bWVtLCBjb25zdCBjaGFyICpub2RlKQogfQogCiAvKiBXaGF0IGRvIHBhcmVudHMgc2F5PyAqLwot c3RhdGljIGVudW0geHNfcGVybV90eXBlIGFza19wYXJlbnRzKHN0cnVjdCBjb25uZWN0aW9uICpj b25uLCBjb25zdCBjaGFyICpuYW1lKQorc3RhdGljIGVudW0geHNfcGVybV90eXBlIGFza19wYXJl bnRzKHN0cnVjdCBjb25uZWN0aW9uICpjb25uLCBjb25zdCB2b2lkICptZW0sCisJCQkJICAgICBj b25zdCBjaGFyICpuYW1lKQogewogCXN0cnVjdCBub2RlICpub2RlOwogCiAJZG8gewotCQluYW1l ID0gZ2V0X3BhcmVudChuYW1lLCBuYW1lKTsKLQkJbm9kZSA9IHJlYWRfbm9kZShjb25uLCBuYW1l LCBuYW1lKTsKKwkJbmFtZSA9IGdldF9wYXJlbnQobWVtLCBuYW1lKTsKKwkJbm9kZSA9IHJlYWRf bm9kZShjb25uLCBtZW0sIG5hbWUpOwogCQlpZiAobm9kZSkKIAkJCWJyZWFrOwogCX0gd2hpbGUg KCFzdHJlcShuYW1lLCAiLyIpKTsKQEAgLTU0MSwyMCArNTQyLDIyIEBAIHN0YXRpYyBlbnVtIHhz X3Blcm1fdHlwZSBhc2tfcGFyZW50cyhzdHJ1Y3QgY29ubmVjdGlvbiAqY29ubiwgY29uc3QgY2hh ciAqbmFtZSkKICAqIHNwZWNpZmljIG5vZGUgd2l0aG91dCBhbGxvd2luZyBpdCBpbiB0aGUgcGFy ZW50cy4gIElmIGl0J3MgZ29pbmcgdG8KICAqIGZhaWwsIGhvd2V2ZXIsIHdlIGRvbid0IHdhbnQg dGhlIGVycm5vIHRvIGluZGljYXRlIGFueSBpbmZvcm1hdGlvbgogICogYWJvdXQgdGhlIG5vZGUu ICovCi1zdGF0aWMgaW50IGVycm5vX2Zyb21fcGFyZW50cyhzdHJ1Y3QgY29ubmVjdGlvbiAqY29u biwgY29uc3QgY2hhciAqbm9kZSwKLQkJCSAgICAgIGludCBlcnJudW0sIGVudW0geHNfcGVybV90 eXBlIHBlcm0pCitzdGF0aWMgaW50IGVycm5vX2Zyb21fcGFyZW50cyhzdHJ1Y3QgY29ubmVjdGlv biAqY29ubiwgY29uc3Qgdm9pZCAqbWVtLAorCQkJICAgICAgY29uc3QgY2hhciAqbm9kZSwgaW50 IGVycm51bSwKKwkJCSAgICAgIGVudW0geHNfcGVybV90eXBlIHBlcm0pCiB7CiAJLyogV2UgYWx3 YXlzIHRlbGwgdGhlbSBhYm91dCBtZW1vcnkgZmFpbHVyZXMuICovCiAJaWYgKGVycm51bSA9PSBF Tk9NRU0pCiAJCXJldHVybiBlcnJudW07CiAKLQlpZiAoYXNrX3BhcmVudHMoY29ubiwgbm9kZSkg JiBwZXJtKQorCWlmIChhc2tfcGFyZW50cyhjb25uLCBtZW0sIG5vZGUpICYgcGVybSkKIAkJcmV0 dXJuIGVycm51bTsKIAlyZXR1cm4gRUFDQ0VTOwogfQogCiAvKiBJZiBpdCBmYWlscywgcmV0dXJu cyBOVUxMIGFuZCBzZXRzIGVycm5vLiAqLwogc3RydWN0IG5vZGUgKmdldF9ub2RlKHN0cnVjdCBj b25uZWN0aW9uICpjb25uLAorCQkgICAgICBjb25zdCB2b2lkICptZW0sCiAJCSAgICAgIGNvbnN0 IGNoYXIgKm5hbWUsCiAJCSAgICAgIGVudW0geHNfcGVybV90eXBlIHBlcm0pCiB7CkBAIC01NjQs NyArNTY3LDcgQEAgc3RydWN0IG5vZGUgKmdldF9ub2RlKHN0cnVjdCBjb25uZWN0aW9uICpjb25u LAogCQllcnJubyA9IEVJTlZBTDsKIAkJcmV0dXJuIE5VTEw7CiAJfQotCW5vZGUgPSByZWFkX25v ZGUoY29ubiwgbmFtZSwgbmFtZSk7CisJbm9kZSA9IHJlYWRfbm9kZShjb25uLCBtZW0sIG5hbWUp OwogCS8qIElmIHdlIGRvbid0IGhhdmUgcGVybWlzc2lvbiwgd2UgZG9uJ3QgaGF2ZSBub2RlLiAq LwogCWlmIChub2RlKSB7CiAJCWlmICgocGVybV9mb3JfY29ubihjb25uLCBub2RlLT5wZXJtcywg bm9kZS0+bnVtX3Blcm1zKSAmIHBlcm0pCkBAIC01NzUsNyArNTc4LDcgQEAgc3RydWN0IG5vZGUg KmdldF9ub2RlKHN0cnVjdCBjb25uZWN0aW9uICpjb25uLAogCX0KIAkvKiBDbGVhbiB1cCBlcnJu byBpZiB0aGV5IHdlcmVuJ3Qgc3VwcG9zZWQgdG8ga25vdy4gKi8KIAlpZiAoIW5vZGUpIAotCQll cnJubyA9IGVycm5vX2Zyb21fcGFyZW50cyhjb25uLCBuYW1lLCBlcnJubywgcGVybSk7CisJCWVy cm5vID0gZXJybm9fZnJvbV9wYXJlbnRzKGNvbm4sIG1lbSwgbmFtZSwgZXJybm8sIHBlcm0pOwog CXJldHVybiBub2RlOwogfQogCkBAIC03NjgsNyArNzcxLDcgQEAgc3RhdGljIHZvaWQgc2VuZF9k aXJlY3Rvcnkoc3RydWN0IGNvbm5lY3Rpb24gKmNvbm4sIHN0cnVjdCBidWZmZXJlZF9kYXRhICpp bikKIAljb25zdCBjaGFyICpuYW1lID0gb25lYXJnKGluKTsKIAogCW5hbWUgPSBjYW5vbmljYWxp emUoY29ubiwgbmFtZSk7Ci0Jbm9kZSA9IGdldF9ub2RlKGNvbm4sIG5hbWUsIFhTX1BFUk1fUkVB RCk7CisJbm9kZSA9IGdldF9ub2RlKGNvbm4sIGluLCBuYW1lLCBYU19QRVJNX1JFQUQpOwogCWlm ICghbm9kZSkgewogCQlzZW5kX2Vycm9yKGNvbm4sIGVycm5vKTsKIAkJcmV0dXJuOwpAQCAtNzgz LDcgKzc4Niw3IEBAIHN0YXRpYyB2b2lkIGRvX3JlYWQoc3RydWN0IGNvbm5lY3Rpb24gKmNvbm4s IHN0cnVjdCBidWZmZXJlZF9kYXRhICppbikKIAljb25zdCBjaGFyICpuYW1lID0gb25lYXJnKGlu KTsKIAogCW5hbWUgPSBjYW5vbmljYWxpemUoY29ubiwgbmFtZSk7Ci0Jbm9kZSA9IGdldF9ub2Rl KGNvbm4sIG5hbWUsIFhTX1BFUk1fUkVBRCk7CisJbm9kZSA9IGdldF9ub2RlKGNvbm4sIGluLCBu YW1lLCBYU19QRVJNX1JFQUQpOwogCWlmICghbm9kZSkgewogCQlzZW5kX2Vycm9yKGNvbm4sIGVy cm5vKTsKIAkJcmV0dXJuOwpAQCAtOTIwLDcgKzkyMyw3IEBAIHN0YXRpYyB2b2lkIGRvX3dyaXRl KHN0cnVjdCBjb25uZWN0aW9uICpjb25uLCBzdHJ1Y3QgYnVmZmVyZWRfZGF0YSAqaW4pCiAJZGF0 YWxlbiA9IGluLT51c2VkIC0gb2Zmc2V0OwogCiAJbmFtZSA9IGNhbm9uaWNhbGl6ZShjb25uLCB2 ZWNbMF0pOwotCW5vZGUgPSBnZXRfbm9kZShjb25uLCBuYW1lLCBYU19QRVJNX1dSSVRFKTsKKwlu b2RlID0gZ2V0X25vZGUoY29ubiwgaW4sIG5hbWUsIFhTX1BFUk1fV1JJVEUpOwogCWlmICghbm9k ZSkgewogCQkvKiBObyBwZXJtaXNzaW9ucywgaW52YWxpZCBpbnB1dD8gKi8KIAkJaWYgKGVycm5v ICE9IEVOT0VOVCkgewpAQCAtOTUyLDcgKzk1NSw3IEBAIHN0YXRpYyB2b2lkIGRvX21rZGlyKHN0 cnVjdCBjb25uZWN0aW9uICpjb25uLCBzdHJ1Y3QgYnVmZmVyZWRfZGF0YSAqaW4pCiAJY29uc3Qg Y2hhciAqbmFtZSA9IG9uZWFyZyhpbik7CiAKIAluYW1lID0gY2Fub25pY2FsaXplKGNvbm4sIG5h bWUpOwotCW5vZGUgPSBnZXRfbm9kZShjb25uLCBuYW1lLCBYU19QRVJNX1dSSVRFKTsKKwlub2Rl ID0gZ2V0X25vZGUoY29ubiwgaW4sIG5hbWUsIFhTX1BFUk1fV1JJVEUpOwogCiAJLyogSWYgaXQg YWxyZWFkeSBleGlzdHMsIGZpbmUuICovCiAJaWYgKCFub2RlKSB7CkBAIC0xMDcwLDcgKzEwNzMs NyBAQCBzdGF0aWMgdm9pZCBkb19ybShzdHJ1Y3QgY29ubmVjdGlvbiAqY29ubiwgc3RydWN0IGJ1 ZmZlcmVkX2RhdGEgKmluKQogCWNvbnN0IGNoYXIgKm5hbWUgPSBvbmVhcmcoaW4pOwogCiAJbmFt ZSA9IGNhbm9uaWNhbGl6ZShjb25uLCBuYW1lKTsKLQlub2RlID0gZ2V0X25vZGUoY29ubiwgbmFt ZSwgWFNfUEVSTV9XUklURSk7CisJbm9kZSA9IGdldF9ub2RlKGNvbm4sIGluLCBuYW1lLCBYU19Q RVJNX1dSSVRFKTsKIAlpZiAoIW5vZGUpIHsKIAkJLyogRGlkbid0IGV4aXN0IGFscmVhZHk/ICBG aW5lLCBpZiBwYXJlbnQgZXhpc3RzLiAqLwogCQlpZiAoZXJybm8gPT0gRU5PRU5UKSB7CkBAIC0x MTA3LDcgKzExMTAsNyBAQCBzdGF0aWMgdm9pZCBkb19nZXRfcGVybXMoc3RydWN0IGNvbm5lY3Rp b24gKmNvbm4sIHN0cnVjdCBidWZmZXJlZF9kYXRhICppbikKIAl1bnNpZ25lZCBpbnQgbGVuOwog CiAJbmFtZSA9IGNhbm9uaWNhbGl6ZShjb25uLCBuYW1lKTsKLQlub2RlID0gZ2V0X25vZGUoY29u biwgbmFtZSwgWFNfUEVSTV9SRUFEKTsKKwlub2RlID0gZ2V0X25vZGUoY29ubiwgaW4sIG5hbWUs IFhTX1BFUk1fUkVBRCk7CiAJaWYgKCFub2RlKSB7CiAJCXNlbmRfZXJyb3IoY29ubiwgZXJybm8p OwogCQlyZXR1cm47CkBAIC0xMTM5LDcgKzExNDIsNyBAQCBzdGF0aWMgdm9pZCBkb19zZXRfcGVy bXMoc3RydWN0IGNvbm5lY3Rpb24gKmNvbm4sIHN0cnVjdCBidWZmZXJlZF9kYXRhICppbikKIAlu dW0tLTsKIAogCS8qIFdlIG11c3Qgb3duIG5vZGUgdG8gZG8gdGhpcyAodG9vbHMgY2FuIGRvIHRo aXMgdG9vKS4gKi8KLQlub2RlID0gZ2V0X25vZGUoY29ubiwgbmFtZSwgWFNfUEVSTV9XUklURXxY U19QRVJNX09XTkVSKTsKKwlub2RlID0gZ2V0X25vZGUoY29ubiwgaW4sIG5hbWUsIFhTX1BFUk1f V1JJVEV8WFNfUEVSTV9PV05FUik7CiAJaWYgKCFub2RlKSB7CiAJCXNlbmRfZXJyb3IoY29ubiwg ZXJybm8pOwogCQlyZXR1cm47CmRpZmYgLS1naXQgYS90b29scy94ZW5zdG9yZS94ZW5zdG9yZWRf Y29yZS5oIGIvdG9vbHMveGVuc3RvcmUveGVuc3RvcmVkX2NvcmUuaAppbmRleCA1ZGJmOWM4Li5m NzYzZTQ3IDEwMDY0NAotLS0gYS90b29scy94ZW5zdG9yZS94ZW5zdG9yZWRfY29yZS5oCisrKyBi L3Rvb2xzL3hlbnN0b3JlL3hlbnN0b3JlZF9jb3JlLmgKQEAgLTE0OSw2ICsxNDksNyBAQCBib29s IGNoZWNrX2V2ZW50X25vZGUoY29uc3QgY2hhciAqbm9kZSk7CiAKIC8qIEdldCB0aGlzIG5vZGUs IGNoZWNraW5nIHdlIGhhdmUgcGVybWlzc2lvbnMuICovCiBzdHJ1Y3Qgbm9kZSAqZ2V0X25vZGUo c3RydWN0IGNvbm5lY3Rpb24gKmNvbm4sCisJCSAgICAgIGNvbnN0IHZvaWQgKm1lbSwKIAkJICAg ICAgY29uc3QgY2hhciAqbmFtZSwKIAkJICAgICAgZW51bSB4c19wZXJtX3R5cGUgcGVybSk7CiAK ZGlmZiAtLWdpdCBhL3Rvb2xzL3hlbnN0b3JlL3hlbnN0b3JlZF93YXRjaC5jIGIvdG9vbHMveGVu c3RvcmUveGVuc3RvcmVkX3dhdGNoLmMKaW5kZXggODU0Mzk5OS4uYmVlZmQ2YyAxMDA2NDQKLS0t IGEvdG9vbHMveGVuc3RvcmUveGVuc3RvcmVkX3dhdGNoLmMKKysrIGIvdG9vbHMveGVuc3RvcmUv eGVuc3RvcmVkX3dhdGNoLmMKQEAgLTU3LDcgKzU3LDcgQEAgc3RhdGljIHZvaWQgYWRkX2V2ZW50 KHN0cnVjdCBjb25uZWN0aW9uICpjb25uLAogCiAJaWYgKCFjaGVja19ldmVudF9ub2RlKG5hbWUp KSB7CiAJCS8qIENhbiB0aGlzIGNvbm4gbG9hZCBub2RlLCBvciBzZWUgdGhhdCBpdCBkb2Vzbid0 IGV4aXN0PyAqLwotCQlzdHJ1Y3Qgbm9kZSAqbm9kZSA9IGdldF9ub2RlKGNvbm4sIG5hbWUsIFhT X1BFUk1fUkVBRCk7CisJCXN0cnVjdCBub2RlICpub2RlID0gZ2V0X25vZGUoY29ubiwgbmFtZSwg bmFtZSwgWFNfUEVSTV9SRUFEKTsKIAkJLyoKIAkJICogWFhYIFdlIGFsbG93IEVBQ0NFUyBoZXJl IGJlY2F1c2Ugb3RoZXJ3aXNlIGEgbm9uLWRvbTAKIAkJICogYmFja2VuZCBkcml2ZXIgY2Fubm90 IHdhdGNoIGZvciBkaXNhcHBlYXJhbmNlIG9mIGEgZnJvbnRlbmQKLS0gCjIuNi42CgoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxp bmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVu LWRldmVsCg==