From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Magenheimer Subject: RE: RE: Xenheap disappearance: (was: xen_phys_start for 32b) Date: Thu, 15 Jan 2009 01:48:06 +0000 (GMT) Message-ID: References: <284f216c-47fd-47e6-ace0-1131b0c60d78@default> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="__12319841007525349acsmt702.oracle.com" Return-path: In-Reply-To: <284f216c-47fd-47e6-ace0-1131b0c60d78@default> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: dan.magenheimer@oracle.com, Keir Fraser , xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org --__12319841007525349acsmt702.oracle.com Content-Type: text/plain; charset=Windows-1252 Content-Transfer-Encoding: quoted-printable Oops, accidentally sent a stale patch. This is the correct one (and should compile on 64-bit :-) Also, if you need a signed-off-by line Signed-off-by: Dan Magenheimer > -----Original Message----- > From: Dan Magenheimer=20 > Sent: Wednesday, January 14, 2009 5:27 PM > To: Dan Magenheimer; Keir Fraser; xen-devel@lists.xensource.com > Subject: RE: [Xen-devel] RE: Xenheap disappearance: (was:=20 > xen_phys_start > for 32b) >=20 >=20 > > If this sounds sensible, I will spin a patch as I'm the one keen > > to get this settled. >=20 > Here's the patch I had in mind (compile-tested only). --__12319841007525349acsmt702.oracle.com Content-Type: application/octet-stream; name="xmalloc.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="xmalloc.patch" ZGlmZiAtciA0ZjZhMmJiZGZmM2YgeGVuL2NvbW1vbi94bWFsbG9jX3Rsc2YuYwotLS0gYS94ZW4v Y29tbW9uL3htYWxsb2NfdGxzZi5jCVR1ZSBKYW4gMTMgMTU6NTM6NDcgMjAwOSArMDAwMAorKysg Yi94ZW4vY29tbW9uL3htYWxsb2NfdGxzZi5jCVdlZCBKYW4gMTQgMTg6NDQ6MDggMjAwOSAtMDcw MApAQCAtMjk0LDE1ICsyOTQsMjQgQEAgc3RydWN0IHhtZW1fcG9vbCAqeG1lbV9wb29sX2NyZWF0 ZSgKICAgICBzdHJ1Y3QgeG1lbV9wb29sICpwb29sOwogICAgIHZvaWQgKnJlZ2lvbjsKICAgICBp bnQgcG9vbF9ieXRlcywgcG9vbF9vcmRlcjsKKyNpZmRlZiBfX3g4Nl82NF9fCisgICAgc3RydWN0 IHBhZ2VfaW5mbyAqcGkgPSAwOworI2VuZGlmCiAKICAgICBCVUdfT04obWF4X3NpemUgJiYgKG1h eF9zaXplIDwgaW5pdF9zaXplKSk7CiAKICAgICBwb29sX2J5dGVzID0gUk9VTkRVUF9TSVpFKHNp emVvZigqcG9vbCkpOwogICAgIHBvb2xfb3JkZXIgPSBnZXRfb3JkZXJfZnJvbV9ieXRlcyhwb29s X2J5dGVzKTsKIAorI2lmZGVmIF9feDg2XzY0X18KKyAgICBpZiAoKHBpID0gYWxsb2NfZG9taGVh cF9wYWdlcygwLDAsMCkpID09IE5VTEwpCisgICAgICAgIHJldHVybiBOVUxMOworICAgIHBvb2wg PSBtZm5fdG9fdmlydChwYWdlX3RvX21mbihwaSkpOworI2Vsc2UKICAgICBwb29sID0gKHZvaWQg KilhbGxvY194ZW5oZWFwX3BhZ2VzKHBvb2xfb3JkZXIpOwogICAgIGlmICggcG9vbCA9PSBOVUxM ICkKICAgICAgICAgcmV0dXJuIE5VTEw7CisjZW5kaWYKICAgICBtZW1zZXQocG9vbCwgMCwgcG9v bF9ieXRlcyk7CiAKICAgICAvKiBSb3VuZCB0byBuZXh0IHBhZ2UgYm91bmRhcnkgKi8KQEAgLTMz NCw3ICszNDMsMTEgQEAgc3RydWN0IHhtZW1fcG9vbCAqeG1lbV9wb29sX2NyZWF0ZSgKICAgICBy ZXR1cm4gcG9vbDsKIAogIG91dF9yZWdpb246CisjaWZkZWYgX194ODZfNjRfXworICAgIGZyZWVf ZG9taGVhcF9wYWdlcyhwaSwgcG9vbF9vcmRlcik7CisjZWxzZQogICAgIGZyZWVfeGVuaGVhcF9w YWdlcyhwb29sLCBwb29sX29yZGVyKTsKKyNlbmRpZgogICAgIHJldHVybiBOVUxMOwogfQogCkBA IC00OTYsNiArNTA5LDExOSBAQCB2b2lkIHhtZW1fcG9vbF9mcmVlKHZvaWQgKnB0ciwgc3RydWN0 IHhtCiAgICAgc3Bpbl91bmxvY2soJnBvb2wtPmxvY2spOwogfQogCisjaWZkZWYgX194ODZfNjRf XworLyoKKyAqIEdsdWUgZm9yIDY0LWJpdC1vbmx5IGFkbWFsbG9jKCkuCisgKi8KKworc3RhdGlj IHN0cnVjdCB4bWVtX3Bvb2wgKmFkcG9vbDsKKworc3RhdGljIHZvaWQgKmFkbWFsbG9jX3Bvb2xf Z2V0KHVuc2lnbmVkIGxvbmcgc2l6ZSkKK3sKKyAgICBzdHJ1Y3QgcGFnZV9pbmZvICpwaTsKKwor ICAgIEFTU0VSVChzaXplID09IFBBR0VfU0laRSk7CisKKyAgICBpZiAoKHBpID0gYWxsb2NfZG9t aGVhcF9wYWdlcygwLDAsMCkpID09IE5VTEwpCisgICAgICAgIHJldHVybiBOVUxMOworICAgIHJl dHVybiBtZm5fdG9fdmlydChwYWdlX3RvX21mbihwaSkpOworfQorCitzdGF0aWMgdm9pZCBhZG1h bGxvY19wb29sX3B1dCh2b2lkICpwKQoreworICAgIGZyZWVfZG9taGVhcF9wYWdlcyhtZm5fdG9f cGFnZSh2aXJ0X3RvX21mbihwKSksMCk7Cit9CisKK3N0YXRpYyB2b2lkICphZG1hbGxvY193aG9s ZV9wYWdlcyh1bnNpZ25lZCBsb25nIHNpemUpCit7CisgICAgc3RydWN0IGJoZHIgKmI7CisgICAg c3RydWN0IHBhZ2VfaW5mbyAqcGk7CisgICAgdW5zaWduZWQgaW50IHBhZ2VvcmRlciA9IGdldF9v cmRlcl9mcm9tX2J5dGVzKHNpemUgKyBCSERSX09WRVJIRUFEKTsKKworICAgIHBpID0gYWxsb2Nf ZG9taGVhcF9wYWdlcygwLDAsMCk7CisgICAgaWYgKHBpID09IE5VTEwpCisgICAgICAgIHJldHVy biBOVUxMOworICAgIGIgPSBtZm5fdG9fdmlydChwYWdlX3RvX21mbihwaSkpOworCisgICAgYi0+ c2l6ZSA9ICgxIDw8IChwYWdlb3JkZXIgKyBQQUdFX1NISUZUKSk7CisgICAgcmV0dXJuICh2b2lk ICopYi0+cHRyLmJ1ZmZlcjsKK30KKworc3RhdGljIHZvaWQgdGxzZl9pbml0KHZvaWQpCit7Cisg ICAgSU5JVF9MSVNUX0hFQUQoJnBvb2xfbGlzdF9oZWFkKTsKKyAgICBzcGluX2xvY2tfaW5pdCgm cG9vbF9saXN0X2xvY2spOworICAgIGFkcG9vbCA9IHhtZW1fcG9vbF9jcmVhdGUoCisgICAgICAg ICJhZG1hbGxvYyIsIGFkbWFsbG9jX3Bvb2xfZ2V0LCBhZG1hbGxvY19wb29sX3B1dCwKKyAgICAg ICAgUEFHRV9TSVpFLCAwLCBQQUdFX1NJWkUpOworICAgIEJVR19PTighYWRwb29sKTsKK30KKwor LyoKKyAqIGFkbWFsbG9jKCkKKyAqLworCit2b2lkICpfYWRtYWxsb2ModW5zaWduZWQgbG9uZyBz aXplLCB1bnNpZ25lZCBsb25nIGFsaWduKQoreworICAgIHZvaWQgKnA7CisgICAgdTMyIHBhZDsK KworICAgIEFTU0VSVCghaW5faXJxKCkpOworCisgICAgQVNTRVJUKChhbGlnbiAmIChhbGlnbiAt IDEpKSA9PSAwKTsKKyAgICBpZiAoIGFsaWduIDwgTUVNX0FMSUdOICkKKyAgICAgICAgYWxpZ24g PSBNRU1fQUxJR047CisgICAgc2l6ZSArPSBhbGlnbiAtIE1FTV9BTElHTjsKKworICAgIGlmICgg IWFkcG9vbCApCisgICAgICAgIHRsc2ZfaW5pdCgpOworCisgICAgaWYgKCBzaXplID49IChQQUdF X1NJWkUgLSAoMipCSERSX09WRVJIRUFEKSkgKQorICAgICAgICBwID0gYWRtYWxsb2Nfd2hvbGVf cGFnZXMoc2l6ZSk7CisgICAgZWxzZQorICAgICAgICBwID0geG1lbV9wb29sX2FsbG9jKHNpemUs IGFkcG9vbCk7CisKKyAgICAvKiBBZGQgYWxpZ25tZW50IHBhZGRpbmcuICovCisgICAgaWYgKCAo cGFkID0gLShsb25nKXAgJiAoYWxpZ24gLSAxKSkgIT0gMCApCisgICAgeworICAgICAgICBjaGFy ICpxID0gKGNoYXIgKilwICsgcGFkOworICAgICAgICBzdHJ1Y3QgYmhkciAqYiA9IChzdHJ1Y3Qg YmhkciAqKShxIC0gQkhEUl9PVkVSSEVBRCk7CisgICAgICAgIEFTU0VSVChxID4gKGNoYXIgKilw KTsKKyAgICAgICAgYi0+c2l6ZSA9IHBhZCB8IDE7CisgICAgICAgIHAgPSBxOworICAgIH0KKwor ICAgIEFTU0VSVCgoKHVuc2lnbmVkIGxvbmcpcCAmIChhbGlnbiAtIDEpKSA9PSAwKTsKKyAgICBy ZXR1cm4gcDsKK30KKwordm9pZCBhZGZyZWUodm9pZCAqcCkKK3sKKyAgICBzdHJ1Y3QgYmhkciAq YjsKKworICAgIEFTU0VSVCghaW5faXJxKCkpOworCisgICAgaWYgKCBwID09IE5VTEwgKQorICAg ICAgICByZXR1cm47CisKKyAgICAvKiBTdHJpcCBhbGlnbm1lbnQgcGFkZGluZy4gKi8KKyAgICBi ID0gKHN0cnVjdCBiaGRyICopKChjaGFyICopIHAgLSBCSERSX09WRVJIRUFEKTsKKyAgICBpZiAo IGItPnNpemUgJiAxICkKKyAgICB7CisgICAgICAgIHAgPSAoY2hhciAqKXAgLSAoYi0+c2l6ZSAm IH4xdSk7CisgICAgICAgIGIgPSAoc3RydWN0IGJoZHIgKikoKGNoYXIgKilwIC0gQkhEUl9PVkVS SEVBRCk7CisgICAgICAgIEFTU0VSVCghKGItPnNpemUgJiAxKSk7CisgICAgfQorCisgICAgaWYg KCBiLT5zaXplID49IChQQUdFX1NJWkUgLSAoMipCSERSX09WRVJIRUFEKSkgKQorICAgICAgICBm cmVlX2RvbWhlYXBfcGFnZXMobWZuX3RvX3BhZ2UodmlydF90b19tZm4ocCkpLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgZ2V0X29yZGVyX2Zyb21fYnl0ZXMoYi0+c2l6ZSkpOworICAgIGVs c2UKKyAgICAgICAgeG1lbV9wb29sX2ZyZWUocCwgYWRwb29sKTsKK30KKworI2Vsc2UKKwogLyoK ICAqIEdsdWUgZm9yIHhtYWxsb2MoKS4KICAqLwpAQCAtNTk3LDMgKzcyMyw1IEBAIHZvaWQgeGZy ZWUodm9pZCAqcCkKICAgICBlbHNlCiAgICAgICAgIHhtZW1fcG9vbF9mcmVlKHAsIHhlbnBvb2wp OwogfQorCisjZW5kaWYKZGlmZiAtciA0ZjZhMmJiZGZmM2YgeGVuL2luY2x1ZGUveGVuL3htYWxs b2MuaAotLS0gYS94ZW4vaW5jbHVkZS94ZW4veG1hbGxvYy5oCVR1ZSBKYW4gMTMgMTU6NTM6NDcg MjAwOSArMDAwMAorKysgYi94ZW4vaW5jbHVkZS94ZW4veG1hbGxvYy5oCVdlZCBKYW4gMTQgMTg6 NDQ6MDggMjAwOSAtMDcwMApAQCAtNSw2ICs1LDExIEBACiAvKgogICogWGVuIG1hbGxvYy9mcmVl LXN0eWxlIGludGVyZmFjZS4KICAqLworCisjaWZkZWYgX194ODZfNjRfXworI2RlZmluZSBfeG1h bGxvYyBfYWRtYWxsb2MKKyNkZWZpbmUgeGZyZWUgYWRmcmVlCisjZW5kaWYKIAogLyogQWxsb2Nh dGUgc3BhY2UgZm9yIHR5cGVkIG9iamVjdC4gKi8KICNkZWZpbmUgeG1hbGxvYyhfdHlwZSkgKChf dHlwZSAqKV94bWFsbG9jKHNpemVvZihfdHlwZSksIF9fYWxpZ25vZl9fKF90eXBlKSkpCg== --__12319841007525349acsmt702.oracle.com Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --__12319841007525349acsmt702.oracle.com--