From mboxrd@z Thu Jan 1 00:00:00 1970 From: Juergen Gross Subject: [PATCH v2 3/5] xenstore: add explicit memory context parameter to read_node() Date: Mon, 18 Jul 2016 09:31:27 +0200 Message-ID: <1468827089-9054-4-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 QWRkIGEgcGFyYW1ldGVyIHRvIHhlbnN0b3JlZCByZWFkX25vZGUoKSBmdW5jdGlvbiB0byBleHBs aWNpdGx5CnNwZWNpZnkgdGhlIG1lbW9yeSBjb250ZXh0IHRvIGJlIHVzZWQgZm9yIGFsbG9jYXRp b25zLiBUaGlzIHdpbGwgbWFrZQppdCBlYXNpZXIgdG8gYXZvaWQgbWVtb3J5IGxlYWtzIGJ5IHVz aW5nIGEgY29udGV4dCB3aGljaCBpcyBmcmVlZApzb29uLgoKV2hlbiBjYWxsaW5nIHJlYWRfbm9k ZSgpIHNlbGVjdCBhIHNlbnNpYmxlIG1lbW9yeSBjb250ZXh0IGZvciB0aGUgbmV3CnBhcmFtZXRl ciBieSBwcmVmZXJyaW5nIGEgdGVtcG9yYXJ5IG9uZS4KClNpZ25lZC1vZmYtYnk6IEp1ZXJnZW4g R3Jvc3MgPGpncm9zc0BzdXNlLmNvbT4KLS0tCiB0b29scy94ZW5zdG9yZS94ZW5zdG9yZWRfY29y ZS5jIHwgMjQgKysrKysrKysrKysrKy0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTMgaW5z ZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdG9vbHMveGVuc3RvcmUv eGVuc3RvcmVkX2NvcmUuYyBiL3Rvb2xzL3hlbnN0b3JlL3hlbnN0b3JlZF9jb3JlLmMKaW5kZXgg OTQ0OGVlOC4uZTVjNzRmNCAxMDA2NDQKLS0tIGEvdG9vbHMveGVuc3RvcmUveGVuc3RvcmVkX2Nv cmUuYworKysgYi90b29scy94ZW5zdG9yZS94ZW5zdG9yZWRfY29yZS5jCkBAIC0zOTgsNyArMzk4 LDggQEAgYm9vbCBpc19jaGlsZChjb25zdCBjaGFyICpjaGlsZCwgY29uc3QgY2hhciAqcGFyZW50 KQogfQogCiAvKiBJZiBpdCBmYWlscywgcmV0dXJucyBOVUxMIGFuZCBzZXRzIGVycm5vLiAqLwot c3RhdGljIHN0cnVjdCBub2RlICpyZWFkX25vZGUoc3RydWN0IGNvbm5lY3Rpb24gKmNvbm4sIGNv bnN0IGNoYXIgKm5hbWUpCitzdGF0aWMgc3RydWN0IG5vZGUgKnJlYWRfbm9kZShzdHJ1Y3QgY29u bmVjdGlvbiAqY29ubiwgY29uc3Qgdm9pZCAqbWVtLAorCQkJICAgICAgY29uc3QgY2hhciAqbmFt ZSkKIHsKIAlUREJfREFUQSBrZXksIGRhdGE7CiAJdWludDMyX3QgKnA7CkBAIC00MTksNyArNDIw LDcgQEAgc3RhdGljIHN0cnVjdCBub2RlICpyZWFkX25vZGUoc3RydWN0IGNvbm5lY3Rpb24gKmNv bm4sIGNvbnN0IGNoYXIgKm5hbWUpCiAJCXJldHVybiBOVUxMOwogCX0KIAotCW5vZGUgPSB0YWxs b2MobmFtZSwgc3RydWN0IG5vZGUpOworCW5vZGUgPSB0YWxsb2MobWVtLCBzdHJ1Y3Qgbm9kZSk7 CiAJbm9kZS0+bmFtZSA9IHRhbGxvY19zdHJkdXAobm9kZSwgbmFtZSk7CiAJbm9kZS0+cGFyZW50 ID0gTlVMTDsKIAlub2RlLT50ZGIgPSB0ZGJfY29udGV4dChjb25uKTsKQEAgLTUyMiw3ICs1MjMs NyBAQCBzdGF0aWMgZW51bSB4c19wZXJtX3R5cGUgYXNrX3BhcmVudHMoc3RydWN0IGNvbm5lY3Rp b24gKmNvbm4sIGNvbnN0IGNoYXIgKm5hbWUpCiAKIAlkbyB7CiAJCW5hbWUgPSBnZXRfcGFyZW50 KG5hbWUsIG5hbWUpOwotCQlub2RlID0gcmVhZF9ub2RlKGNvbm4sIG5hbWUpOworCQlub2RlID0g cmVhZF9ub2RlKGNvbm4sIG5hbWUsIG5hbWUpOwogCQlpZiAobm9kZSkKIAkJCWJyZWFrOwogCX0g d2hpbGUgKCFzdHJlcShuYW1lLCAiLyIpKTsKQEAgLTU2Myw3ICs1NjQsNyBAQCBzdHJ1Y3Qgbm9k ZSAqZ2V0X25vZGUoc3RydWN0IGNvbm5lY3Rpb24gKmNvbm4sCiAJCWVycm5vID0gRUlOVkFMOwog CQlyZXR1cm4gTlVMTDsKIAl9Ci0Jbm9kZSA9IHJlYWRfbm9kZShjb25uLCBuYW1lKTsKKwlub2Rl ID0gcmVhZF9ub2RlKGNvbm4sIG5hbWUsIG5hbWUpOwogCS8qIElmIHdlIGRvbid0IGhhdmUgcGVy bWlzc2lvbiwgd2UgZG9uJ3QgaGF2ZSBub2RlLiAqLwogCWlmIChub2RlKSB7CiAJCWlmICgocGVy bV9mb3JfY29ubihjb25uLCBub2RlLT5wZXJtcywgbm9kZS0+bnVtX3Blcm1zKSAmIHBlcm0pCkBA IC04MTksNyArODIwLDcgQEAgc3RhdGljIHN0cnVjdCBub2RlICpjb25zdHJ1Y3Rfbm9kZShzdHJ1 Y3QgY29ubmVjdGlvbiAqY29ubiwgY29uc3QgY2hhciAqbmFtZSkKIAljaGFyICpjaGlsZHJlbiwg KnBhcmVudG5hbWUgPSBnZXRfcGFyZW50KG5hbWUsIG5hbWUpOwogCiAJLyogSWYgcGFyZW50IGRv ZXNuJ3QgZXhpc3QsIGNyZWF0ZSBpdC4gKi8KLQlwYXJlbnQgPSByZWFkX25vZGUoY29ubiwgcGFy ZW50bmFtZSk7CisJcGFyZW50ID0gcmVhZF9ub2RlKGNvbm4sIHBhcmVudG5hbWUsIHBhcmVudG5h bWUpOwogCWlmICghcGFyZW50KQogCQlwYXJlbnQgPSBjb25zdHJ1Y3Rfbm9kZShjb25uLCBwYXJl bnRuYW1lKTsKIAlpZiAoIXBhcmVudCkKQEAgLTk4NCw3ICs5ODUsNyBAQCBzdGF0aWMgdm9pZCBk ZWxldGVfbm9kZShzdHJ1Y3QgY29ubmVjdGlvbiAqY29ubiwgc3RydWN0IG5vZGUgKm5vZGUpCiAJ Zm9yIChpID0gMDsgaSA8IG5vZGUtPmNoaWxkbGVuOyBpICs9IHN0cmxlbihub2RlLT5jaGlsZHJl bitpKSArIDEpIHsKIAkJc3RydWN0IG5vZGUgKmNoaWxkOwogCi0JCWNoaWxkID0gcmVhZF9ub2Rl KGNvbm4sIAorCQljaGlsZCA9IHJlYWRfbm9kZShjb25uLCBub2RlLAogCQkJCSAgdGFsbG9jX2Fz cHJpbnRmKG5vZGUsICIlcy8lcyIsIG5vZGUtPm5hbWUsCiAJCQkJCQkgIG5vZGUtPmNoaWxkcmVu ICsgaSkpOwogCQlpZiAoY2hpbGQpIHsKQEAgLTEwMzYsNyArMTAzNyw3IEBAIHN0YXRpYyBpbnQg X3JtKHN0cnVjdCBjb25uZWN0aW9uICpjb25uLCBzdHJ1Y3Qgbm9kZSAqbm9kZSwgY29uc3QgY2hh ciAqbmFtZSkKIAkvKiBEZWxldGUgZnJvbSBwYXJlbnQgZmlyc3QsIHRoZW4gaWYgd2UgY3Jhc2gs IHRoZSB3b3JzdCB0aGF0IGNhbgogCSAgIGhhcHBlbiBpcyB0aGUgY2hpbGQgd2lsbCBjb250aW51 ZSB0byB0YWtlIHVwIHNwYWNlLCBidXQgd2lsbAogCSAgIG90aGVyd2lzZSBiZSB1bnJlYWNoYWJs ZS4gKi8KLQlzdHJ1Y3Qgbm9kZSAqcGFyZW50ID0gcmVhZF9ub2RlKGNvbm4sIGdldF9wYXJlbnQo bmFtZSwgbmFtZSkpOworCXN0cnVjdCBub2RlICpwYXJlbnQgPSByZWFkX25vZGUoY29ubiwgbmFt ZSwgZ2V0X3BhcmVudChuYW1lLCBuYW1lKSk7CiAJaWYgKCFwYXJlbnQpIHsKIAkJc2VuZF9lcnJv cihjb25uLCBFSU5WQUwpOwogCQlyZXR1cm4gMDsKQEAgLTEwNTUsNyArMTA1Niw3IEBAIHN0YXRp YyBpbnQgX3JtKHN0cnVjdCBjb25uZWN0aW9uICpjb25uLCBzdHJ1Y3Qgbm9kZSAqbm9kZSwgY29u c3QgY2hhciAqbmFtZSkKIHN0YXRpYyB2b2lkIGludGVybmFsX3JtKGNvbnN0IGNoYXIgKm5hbWUp CiB7CiAJY2hhciAqdG5hbWUgPSB0YWxsb2Nfc3RyZHVwKE5VTEwsIG5hbWUpOwotCXN0cnVjdCBu b2RlICpub2RlID0gcmVhZF9ub2RlKE5VTEwsIHRuYW1lKTsKKwlzdHJ1Y3Qgbm9kZSAqbm9kZSA9 IHJlYWRfbm9kZShOVUxMLCB0bmFtZSwgdG5hbWUpOwogCWlmIChub2RlKQogCQlfcm0oTlVMTCwg bm9kZSwgdG5hbWUpOwogCXRhbGxvY19mcmVlKG5vZGUpOwpAQCAtMTA3Myw3ICsxMDc0LDcgQEAg c3RhdGljIHZvaWQgZG9fcm0oc3RydWN0IGNvbm5lY3Rpb24gKmNvbm4sIHN0cnVjdCBidWZmZXJl ZF9kYXRhICppbikKIAlpZiAoIW5vZGUpIHsKIAkJLyogRGlkbid0IGV4aXN0IGFscmVhZHk/ICBG aW5lLCBpZiBwYXJlbnQgZXhpc3RzLiAqLwogCQlpZiAoZXJybm8gPT0gRU5PRU5UKSB7Ci0JCQlu b2RlID0gcmVhZF9ub2RlKGNvbm4sIGdldF9wYXJlbnQoaW4sIG5hbWUpKTsKKwkJCW5vZGUgPSBy ZWFkX25vZGUoY29ubiwgaW4sIGdldF9wYXJlbnQoaW4sIG5hbWUpKTsKIAkJCWlmIChub2RlKSB7 CiAJCQkJc2VuZF9hY2soY29ubiwgWFNfUk0pOwogCQkJCXJldHVybjsKQEAgLTE2MDQsNyArMTYw NSw3IEBAIHN0YXRpYyB2b2lkIHJlbWVtYmVyX3N0cmluZyhzdHJ1Y3QgaGFzaHRhYmxlICpoYXNo LCBjb25zdCBjaGFyICpzdHIpCiAgKi8KIHN0YXRpYyB2b2lkIGNoZWNrX3N0b3JlXyhjb25zdCBj aGFyICpuYW1lLCBzdHJ1Y3QgaGFzaHRhYmxlICpyZWFjaGFibGUpCiB7Ci0Jc3RydWN0IG5vZGUg Km5vZGUgPSByZWFkX25vZGUoTlVMTCwgbmFtZSk7CisJc3RydWN0IG5vZGUgKm5vZGUgPSByZWFk X25vZGUoTlVMTCwgbmFtZSwgbmFtZSk7CiAKIAlpZiAobm9kZSkgewogCQlzaXplX3QgaSA9IDA7 CkBAIC0xNjE4LDcgKzE2MTksOCBAQCBzdGF0aWMgdm9pZCBjaGVja19zdG9yZV8oY29uc3QgY2hh ciAqbmFtZSwgc3RydWN0IGhhc2h0YWJsZSAqcmVhY2hhYmxlKQogCQkJc2l6ZV90IGNoaWxkbGVu ID0gc3RybGVuKG5vZGUtPmNoaWxkcmVuICsgaSk7CiAJCQljaGFyICogY2hpbGRuYW1lID0gY2hp bGRfbmFtZShub2RlLT5uYW1lLAogCQkJCQkJICAgICAgbm9kZS0+Y2hpbGRyZW4gKyBpKTsKLQkJ CXN0cnVjdCBub2RlICpjaGlsZG5vZGUgPSByZWFkX25vZGUoTlVMTCwgY2hpbGRuYW1lKTsKKwkJ CXN0cnVjdCBub2RlICpjaGlsZG5vZGUgPSByZWFkX25vZGUoTlVMTCwgY2hpbGRuYW1lLAorCQkJ CQkJCSAgIGNoaWxkbmFtZSk7CiAJCQkKIAkJCWlmIChjaGlsZG5vZGUpIHsKIAkJCQlpZiAoaGFz aHRhYmxlX3NlYXJjaChjaGlsZHJlbiwgY2hpbGRuYW1lKSkgewotLSAKMi42LjYKCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGlu ZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4t ZGV2ZWwK