From: Juergen Gross Subject: [PATCH RFC 09/49] xen/sched: alloc struct sched_item for each vcpu Date: Fri, 29 Mar 2019 16:08:54 +0100 Message-ID: <20190329150934.17694-10-jgross@suse.com> References: <20190329150934.17694-1-jgross@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1h9t8b-0003Va-4G for xen-devel@lists.xenproject.org; Fri, 29 Mar 2019 15:09:45 +0000 In-Reply-To: <20190329150934.17694-1-jgross@suse.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Tim Deegan , Stefano Stabellini , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Dario Faggioli , Julien Grall , Jan Beulich List-Id: xen-devel@lists.xenproject.org QWxsb2NhdGUgYSBzdHJ1Y3Qgc2NoZWRfaXRlbSBmb3IgZWFjaCB2Y3B1LiBUaGlzIHJlbW92ZXMg dGhlIG5lZWQgdG8KaGF2ZSBpdCBsb2NhbGx5IG9uIHRoZSBzdGFjayBpbiBzY2hlZHVsZS5jLgoK U2lnbmVkLW9mZi1ieTogSnVlcmdlbiBHcm9zcyA8amdyb3NzQHN1c2UuY29tPgotLS0KIHhlbi9j b21tb24vc2NoZWR1bGUuYyAgIHwgNjggKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLQogeGVuL2luY2x1ZGUveGVuL3NjaGVkLmggfCAgMiArKwogMiBmaWxl cyBjaGFuZ2VkLCAzNCBpbnNlcnRpb25zKCspLCAzNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS94ZW4vY29tbW9uL3NjaGVkdWxlLmMgYi94ZW4vY29tbW9uL3NjaGVkdWxlLmMKaW5kZXggZDFh OTU4MTQzYS4uMmI3ZDYyZWRlNyAxMDA2NDQKLS0tIGEveGVuL2NvbW1vbi9zY2hlZHVsZS5jCisr KyBiL3hlbi9jb21tb24vc2NoZWR1bGUuYwpAQCAtMjU2LDEwICsyNTYsMTUgQEAgc3RhdGljIHZv aWQgc2NoZWRfc3Bpbl91bmxvY2tfZG91YmxlKHNwaW5sb2NrX3QgKmxvY2sxLCBzcGlubG9ja190 ICpsb2NrMiwKIGludCBzY2hlZF9pbml0X3ZjcHUoc3RydWN0IHZjcHUgKnYsIHVuc2lnbmVkIGlu dCBwcm9jZXNzb3IpCiB7CiAgICAgc3RydWN0IGRvbWFpbiAqZCA9IHYtPmRvbWFpbjsKLSAgICBz dHJ1Y3Qgc2NoZWRfaXRlbSBpdGVtID0geyAudmNwdSA9IHYgfTsKKyAgICBzdHJ1Y3Qgc2NoZWRf aXRlbSAqaXRlbTsKIAogICAgIHYtPnByb2Nlc3NvciA9IHByb2Nlc3NvcjsKIAorICAgIGlmICgg KGl0ZW0gPSB4emFsbG9jKHN0cnVjdCBzY2hlZF9pdGVtKSkgPT0gTlVMTCApCisgICAgICAgIHJl dHVybiAxOworICAgIHYtPnNjaGVkX2l0ZW0gPSBpdGVtOworICAgIGl0ZW0tPnZjcHUgPSB2Owor CiAgICAgLyogSW5pdGlhbGlzZSB0aGUgcGVyLXZjcHUgdGltZXJzLiAqLwogICAgIGluaXRfdGlt ZXIoJnYtPnBlcmlvZGljX3RpbWVyLCB2Y3B1X3BlcmlvZGljX3RpbWVyX2ZuLAogICAgICAgICAg ICAgICAgdiwgdi0+cHJvY2Vzc29yKTsKQEAgLTI2OCwxMCArMjczLDE0IEBAIGludCBzY2hlZF9p bml0X3ZjcHUoc3RydWN0IHZjcHUgKnYsIHVuc2lnbmVkIGludCBwcm9jZXNzb3IpCiAgICAgaW5p dF90aW1lcigmdi0+cG9sbF90aW1lciwgcG9sbF90aW1lcl9mbiwKICAgICAgICAgICAgICAgIHYs IHYtPnByb2Nlc3Nvcik7CiAKLSAgICB2LT5zY2hlZF9wcml2ID0gU0NIRURfT1AoZG9tX3NjaGVk dWxlcihkKSwgYWxsb2NfdmRhdGEsICZpdGVtLAorICAgIHYtPnNjaGVkX3ByaXYgPSBTQ0hFRF9P UChkb21fc2NoZWR1bGVyKGQpLCBhbGxvY192ZGF0YSwgaXRlbSwKICAgICAgICAgICAgICAgICAg ICAgIGQtPnNjaGVkX3ByaXYpOwogICAgIGlmICggdi0+c2NoZWRfcHJpdiA9PSBOVUxMICkKKyAg ICB7CisgICAgICAgIHYtPnNjaGVkX2l0ZW0gPSBOVUxMOworICAgICAgICB4ZnJlZShpdGVtKTsK ICAgICAgICAgcmV0dXJuIDE7CisgICAgfQogCiAgICAgLyoKICAgICAgKiBJbml0aWFsaXplIGFm ZmluaXR5IHNldHRpbmdzLiBUaGUgaWRsZXIsIGFuZCBwb3RlbnRpYWxseQpAQCAtMjkwLDcgKzI5 OSw3IEBAIGludCBzY2hlZF9pbml0X3ZjcHUoc3RydWN0IHZjcHUgKnYsIHVuc2lnbmVkIGludCBw cm9jZXNzb3IpCiAgICAgfQogICAgIGVsc2UKICAgICB7Ci0gICAgICAgIFNDSEVEX09QKGRvbV9z Y2hlZHVsZXIoZCksIGluc2VydF9pdGVtLCAmaXRlbSk7CisgICAgICAgIFNDSEVEX09QKGRvbV9z Y2hlZHVsZXIoZCksIGluc2VydF9pdGVtLCBpdGVtKTsKICAgICB9CiAKICAgICByZXR1cm4gMDsK QEAgLTMxMSw3ICszMjAsNiBAQCBpbnQgc2NoZWRfbW92ZV9kb21haW4oc3RydWN0IGRvbWFpbiAq ZCwgc3RydWN0IGNwdXBvb2wgKmMpCiAgICAgdm9pZCAqdmNwdWRhdGE7CiAgICAgc3RydWN0IHNj aGVkdWxlciAqb2xkX29wczsKICAgICB2b2lkICpvbGRfZG9tZGF0YTsKLSAgICBzdHJ1Y3Qgc2No ZWRfaXRlbSBpdGVtOwogCiAgICAgZm9yX2VhY2hfdmNwdSAoIGQsIHYgKQogICAgIHsKQEAgLTMz Miw4ICszNDAsOCBAQCBpbnQgc2NoZWRfbW92ZV9kb21haW4oc3RydWN0IGRvbWFpbiAqZCwgc3Ry dWN0IGNwdXBvb2wgKmMpCiAKICAgICBmb3JfZWFjaF92Y3B1ICggZCwgdiApCiAgICAgewotICAg ICAgICBpdGVtLnZjcHUgPSB2OwotICAgICAgICB2Y3B1X3ByaXZbdi0+dmNwdV9pZF0gPSBTQ0hF RF9PUChjLT5zY2hlZCwgYWxsb2NfdmRhdGEsICZpdGVtLCBkb21kYXRhKTsKKyAgICAgICAgdmNw dV9wcml2W3YtPnZjcHVfaWRdID0gU0NIRURfT1AoYy0+c2NoZWQsIGFsbG9jX3ZkYXRhLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2LT5zY2hlZF9pdGVtLCBkb21k YXRhKTsKICAgICAgICAgaWYgKCB2Y3B1X3ByaXZbdi0+dmNwdV9pZF0gPT0gTlVMTCApCiAgICAg ICAgIHsKICAgICAgICAgICAgIGZvcl9lYWNoX3ZjcHUgKCBkLCB2ICkKQEAgLTM1MSw4ICszNTks NyBAQCBpbnQgc2NoZWRfbW92ZV9kb21haW4oc3RydWN0IGRvbWFpbiAqZCwgc3RydWN0IGNwdXBv b2wgKmMpCiAKICAgICBmb3JfZWFjaF92Y3B1ICggZCwgdiApCiAgICAgewotICAgICAgICBpdGVt LnZjcHUgPSB2OwotICAgICAgICBTQ0hFRF9PUChvbGRfb3BzLCByZW1vdmVfaXRlbSwgJml0ZW0p OworICAgICAgICBTQ0hFRF9PUChvbGRfb3BzLCByZW1vdmVfaXRlbSwgdi0+c2NoZWRfaXRlbSk7 CiAgICAgfQogCiAgICAgZC0+Y3B1cG9vbCA9IGM7CkBAIC0zNjMsNyArMzcwLDYgQEAgaW50IHNj aGVkX21vdmVfZG9tYWluKHN0cnVjdCBkb21haW4gKmQsIHN0cnVjdCBjcHVwb29sICpjKQogICAg IHsKICAgICAgICAgc3BpbmxvY2tfdCAqbG9jazsKIAotICAgICAgICBpdGVtLnZjcHUgPSB2Owog ICAgICAgICB2Y3B1ZGF0YSA9IHYtPnNjaGVkX3ByaXY7CiAKICAgICAgICAgbWlncmF0ZV90aW1l cigmdi0+cGVyaW9kaWNfdGltZXIsIG5ld19wKTsKQEAgLTM4OCw3ICszOTQsNyBAQCBpbnQgc2No ZWRfbW92ZV9kb21haW4oc3RydWN0IGRvbWFpbiAqZCwgc3RydWN0IGNwdXBvb2wgKmMpCiAKICAg ICAgICAgbmV3X3AgPSBjcHVtYXNrX2N5Y2xlKG5ld19wLCBjLT5jcHVfdmFsaWQpOwogCi0gICAg ICAgIFNDSEVEX09QKGMtPnNjaGVkLCBpbnNlcnRfaXRlbSwgJml0ZW0pOworICAgICAgICBTQ0hF RF9PUChjLT5zY2hlZCwgaW5zZXJ0X2l0ZW0sIHYtPnNjaGVkX2l0ZW0pOwogCiAgICAgICAgIFND SEVEX09QKG9sZF9vcHMsIGZyZWVfdmRhdGEsIHZjcHVkYXRhKTsKICAgICB9CkBAIC00MDYsMTUg KzQxMiwxNyBAQCBpbnQgc2NoZWRfbW92ZV9kb21haW4oc3RydWN0IGRvbWFpbiAqZCwgc3RydWN0 IGNwdXBvb2wgKmMpCiAKIHZvaWQgc2NoZWRfZGVzdHJveV92Y3B1KHN0cnVjdCB2Y3B1ICp2KQog ewotICAgIHN0cnVjdCBzY2hlZF9pdGVtIGl0ZW0gPSB7IC52Y3B1ID0gdiB9OworICAgIHN0cnVj dCBzY2hlZF9pdGVtICppdGVtID0gdi0+c2NoZWRfaXRlbTsKIAogICAgIGtpbGxfdGltZXIoJnYt PnBlcmlvZGljX3RpbWVyKTsKICAgICBraWxsX3RpbWVyKCZ2LT5zaW5nbGVzaG90X3RpbWVyKTsK ICAgICBraWxsX3RpbWVyKCZ2LT5wb2xsX3RpbWVyKTsKICAgICBpZiAoIHRlc3RfYW5kX2NsZWFy X2Jvb2wodi0+aXNfdXJnZW50KSApCiAgICAgICAgIGF0b21pY19kZWMoJnBlcl9jcHUoc2NoZWR1 bGVfZGF0YSwgdi0+cHJvY2Vzc29yKS51cmdlbnRfY291bnQpOwotICAgIFNDSEVEX09QKHZjcHVf c2NoZWR1bGVyKHYpLCByZW1vdmVfaXRlbSwgJml0ZW0pOworICAgIFNDSEVEX09QKHZjcHVfc2No ZWR1bGVyKHYpLCByZW1vdmVfaXRlbSwgaXRlbSk7CiAgICAgU0NIRURfT1AodmNwdV9zY2hlZHVs ZXIodiksIGZyZWVfdmRhdGEsIHYtPnNjaGVkX3ByaXYpOworICAgIHhmcmVlKGl0ZW0pOworICAg IHYtPnNjaGVkX2l0ZW0gPSBOVUxMOwogfQogCiBpbnQgc2NoZWRfaW5pdF9kb21haW4oc3RydWN0 IGRvbWFpbiAqZCwgaW50IHBvb2xpZCkKQEAgLTQ1OCw4ICs0NjYsNiBAQCB2b2lkIHNjaGVkX2Rl c3Ryb3lfZG9tYWluKHN0cnVjdCBkb21haW4gKmQpCiAKIHZvaWQgdmNwdV9zbGVlcF9ub3N5bmNf bG9ja2VkKHN0cnVjdCB2Y3B1ICp2KQogewotICAgIHN0cnVjdCBzY2hlZF9pdGVtIGl0ZW0gPSB7 IC52Y3B1ID0gdiB9OwotCiAgICAgQVNTRVJUKHNwaW5faXNfbG9ja2VkKHBlcl9jcHUoc2NoZWR1 bGVfZGF0YSx2LT5wcm9jZXNzb3IpLnNjaGVkdWxlX2xvY2spKTsKIAogICAgIGlmICggbGlrZWx5 KCF2Y3B1X3J1bm5hYmxlKHYpKSApCkBAIC00NjcsNyArNDczLDcgQEAgdm9pZCB2Y3B1X3NsZWVw X25vc3luY19sb2NrZWQoc3RydWN0IHZjcHUgKnYpCiAgICAgICAgIGlmICggdi0+cnVuc3RhdGUu c3RhdGUgPT0gUlVOU1RBVEVfcnVubmFibGUgKQogICAgICAgICAgICAgdmNwdV9ydW5zdGF0ZV9j aGFuZ2UodiwgUlVOU1RBVEVfb2ZmbGluZSwgTk9XKCkpOwogCi0gICAgICAgIFNDSEVEX09QKHZj cHVfc2NoZWR1bGVyKHYpLCBzbGVlcCwgJml0ZW0pOworICAgICAgICBTQ0hFRF9PUCh2Y3B1X3Nj aGVkdWxlcih2KSwgc2xlZXAsIHYtPnNjaGVkX2l0ZW0pOwogICAgIH0KIH0KIApAQCAtNDk5LDcg KzUwNSw2IEBAIHZvaWQgdmNwdV93YWtlKHN0cnVjdCB2Y3B1ICp2KQogewogICAgIHVuc2lnbmVk IGxvbmcgZmxhZ3M7CiAgICAgc3BpbmxvY2tfdCAqbG9jazsKLSAgICBzdHJ1Y3Qgc2NoZWRfaXRl bSBpdGVtID0geyAudmNwdSA9IHYgfTsKIAogICAgIFRSQUNFXzJEKFRSQ19TQ0hFRF9XQUtFLCB2 LT5kb21haW4tPmRvbWFpbl9pZCwgdi0+dmNwdV9pZCk7CiAKQEAgLTUwOSw3ICs1MTQsNyBAQCB2 b2lkIHZjcHVfd2FrZShzdHJ1Y3QgdmNwdSAqdikKICAgICB7CiAgICAgICAgIGlmICggdi0+cnVu c3RhdGUuc3RhdGUgPj0gUlVOU1RBVEVfYmxvY2tlZCApCiAgICAgICAgICAgICB2Y3B1X3J1bnN0 YXRlX2NoYW5nZSh2LCBSVU5TVEFURV9ydW5uYWJsZSwgTk9XKCkpOwotICAgICAgICBTQ0hFRF9P UCh2Y3B1X3NjaGVkdWxlcih2KSwgd2FrZSwgJml0ZW0pOworICAgICAgICBTQ0hFRF9PUCh2Y3B1 X3NjaGVkdWxlcih2KSwgd2FrZSwgdi0+c2NoZWRfaXRlbSk7CiAgICAgfQogICAgIGVsc2UgaWYg KCAhKHYtPnBhdXNlX2ZsYWdzICYgVlBGX2Jsb2NrZWQpICkKICAgICB7CkBAIC01NDgsNyArNTUz LDYgQEAgdm9pZCB2Y3B1X3VuYmxvY2soc3RydWN0IHZjcHUgKnYpCiBzdGF0aWMgdm9pZCB2Y3B1 X21vdmVfbG9ja2VkKHN0cnVjdCB2Y3B1ICp2LCB1bnNpZ25lZCBpbnQgbmV3X2NwdSkKIHsKICAg ICB1bnNpZ25lZCBpbnQgb2xkX2NwdSA9IHYtPnByb2Nlc3NvcjsKLSAgICBzdHJ1Y3Qgc2NoZWRf aXRlbSBpdGVtID0geyAudmNwdSA9IHYgfTsKIAogICAgIC8qCiAgICAgICogVHJhbnNmZXIgdXJn ZW5jeSBzdGF0dXMgdG8gbmV3IENQVSBiZWZvcmUgc3dpdGNoaW5nIENQVXMsIGFzCkBAIC01NjYs NyArNTcwLDcgQEAgc3RhdGljIHZvaWQgdmNwdV9tb3ZlX2xvY2tlZChzdHJ1Y3QgdmNwdSAqdiwg dW5zaWduZWQgaW50IG5ld19jcHUpCiAgICAgICogcG9pbnRlciBjYW50JyBjaGFuZ2Ugd2hpbGUg dGhlIGN1cnJlbnQgbG9jayBpcyBoZWxkLgogICAgICAqLwogICAgIGlmICggdmNwdV9zY2hlZHVs ZXIodiktPm1pZ3JhdGUgKQotICAgICAgICBTQ0hFRF9PUCh2Y3B1X3NjaGVkdWxlcih2KSwgbWln cmF0ZSwgJml0ZW0sIG5ld19jcHUpOworICAgICAgICBTQ0hFRF9PUCh2Y3B1X3NjaGVkdWxlcih2 KSwgbWlncmF0ZSwgdi0+c2NoZWRfaXRlbSwgbmV3X2NwdSk7CiAgICAgZWxzZQogICAgICAgICB2 LT5wcm9jZXNzb3IgPSBuZXdfY3B1OwogfQpAQCAtNjEwLDcgKzYxNCw2IEBAIHN0YXRpYyB2b2lk IHZjcHVfbWlncmF0ZV9maW5pc2goc3RydWN0IHZjcHUgKnYpCiAgICAgdW5zaWduZWQgaW50IG9s ZF9jcHUsIG5ld19jcHU7CiAgICAgc3BpbmxvY2tfdCAqb2xkX2xvY2ssICpuZXdfbG9jazsKICAg ICBib29sX3QgcGlja19jYWxsZWQgPSAwOwotICAgIHN0cnVjdCBzY2hlZF9pdGVtIGl0ZW0gPSB7 IC52Y3B1ID0gdiB9OwogCiAgICAgLyoKICAgICAgKiBJZiB0aGUgdmNwdSBpcyBjdXJyZW50bHkg cnVubmluZywgdGhpcyB3aWxsIGJlIGhhbmRsZWQgYnkKQEAgLTY0Nyw3ICs2NTAsNyBAQCBzdGF0 aWMgdm9pZCB2Y3B1X21pZ3JhdGVfZmluaXNoKHN0cnVjdCB2Y3B1ICp2KQogICAgICAgICAgICAg ICAgIGJyZWFrOwogCiAgICAgICAgICAgICAvKiBTZWxlY3QgYSBuZXcgQ1BVLiAqLwotICAgICAg ICAgICAgbmV3X2NwdSA9IFNDSEVEX09QKHZjcHVfc2NoZWR1bGVyKHYpLCBwaWNrX2NwdSwgJml0 ZW0pOworICAgICAgICAgICAgbmV3X2NwdSA9IFNDSEVEX09QKHZjcHVfc2NoZWR1bGVyKHYpLCBw aWNrX2NwdSwgdi0+c2NoZWRfaXRlbSk7CiAgICAgICAgICAgICBpZiAoIChuZXdfbG9jayA9PSBw ZXJfY3B1KHNjaGVkdWxlX2RhdGEsIG5ld19jcHUpLnNjaGVkdWxlX2xvY2spICYmCiAgICAgICAg ICAgICAgICAgIGNwdW1hc2tfdGVzdF9jcHUobmV3X2NwdSwgdi0+ZG9tYWluLT5jcHVwb29sLT5j cHVfdmFsaWQpICkKICAgICAgICAgICAgICAgICBicmVhazsKQEAgLTcxNyw3ICs3MjAsNiBAQCB2 b2lkIHJlc3RvcmVfdmNwdV9hZmZpbml0eShzdHJ1Y3QgZG9tYWluICpkKQogICAgIHsKICAgICAg ICAgc3BpbmxvY2tfdCAqbG9jazsKICAgICAgICAgdW5zaWduZWQgaW50IG9sZF9jcHUgPSB2LT5w cm9jZXNzb3I7Ci0gICAgICAgIHN0cnVjdCBzY2hlZF9pdGVtIGl0ZW0gPSB7IC52Y3B1ID0gdiB9 OwogCiAgICAgICAgIEFTU0VSVCghdmNwdV9ydW5uYWJsZSh2KSk7CiAKQEAgLTc1Myw3ICs3NTUs NyBAQCB2b2lkIHJlc3RvcmVfdmNwdV9hZmZpbml0eShzdHJ1Y3QgZG9tYWluICpkKQogICAgICAg ICB2LT5wcm9jZXNzb3IgPSBjcHVtYXNrX2FueShjcHVtYXNrX3NjcmF0Y2hfY3B1KGNwdSkpOwog CiAgICAgICAgIGxvY2sgPSB2Y3B1X3NjaGVkdWxlX2xvY2tfaXJxKHYpOwotICAgICAgICB2LT5w cm9jZXNzb3IgPSBTQ0hFRF9PUCh2Y3B1X3NjaGVkdWxlcih2KSwgcGlja19jcHUsICZpdGVtKTsK KyAgICAgICAgdi0+cHJvY2Vzc29yID0gU0NIRURfT1AodmNwdV9zY2hlZHVsZXIodiksIHBpY2tf Y3B1LCB2LT5zY2hlZF9pdGVtKTsKICAgICAgICAgc3Bpbl91bmxvY2tfaXJxKGxvY2spOwogCiAg ICAgICAgIGlmICggb2xkX2NwdSAhPSB2LT5wcm9jZXNzb3IgKQpAQCAtODcxLDkgKzg3Myw4IEBA IHN0YXRpYyBpbnQgY3B1X2Rpc2FibGVfc2NoZWR1bGVyX2NoZWNrKHVuc2lnbmVkIGludCBjcHUp CiB2b2lkIHNjaGVkX3NldF9hZmZpbml0eSgKICAgICBzdHJ1Y3QgdmNwdSAqdiwgY29uc3QgY3B1 bWFza190ICpoYXJkLCBjb25zdCBjcHVtYXNrX3QgKnNvZnQpCiB7Ci0gICAgc3RydWN0IHNjaGVk X2l0ZW0gaXRlbSA9IHsgLnZjcHUgPSB2IH07Ci0KLSAgICBTQ0hFRF9PUChkb21fc2NoZWR1bGVy KHYtPmRvbWFpbiksIGFkanVzdF9hZmZpbml0eSwgJml0ZW0sIGhhcmQsIHNvZnQpOworICAgIFND SEVEX09QKGRvbV9zY2hlZHVsZXIodi0+ZG9tYWluKSwgYWRqdXN0X2FmZmluaXR5LCB2LT5zY2hl ZF9pdGVtLAorICAgICAgICAgICAgIGhhcmQsIHNvZnQpOwogCiAgICAgaWYgKCBoYXJkICkKICAg ICAgICAgY3B1bWFza19jb3B5KHYtPmNwdV9oYXJkX2FmZmluaXR5LCBoYXJkKTsKQEAgLTEwNDks MTAgKzEwNTAsOSBAQCBzdGF0aWMgbG9uZyBkb19wb2xsKHN0cnVjdCBzY2hlZF9wb2xsICpzY2hl ZF9wb2xsKQogbG9uZyB2Y3B1X3lpZWxkKHZvaWQpCiB7CiAgICAgc3RydWN0IHZjcHUgKiB2PWN1 cnJlbnQ7Ci0gICAgc3RydWN0IHNjaGVkX2l0ZW0gaXRlbSA9IHsgLnZjcHUgPSB2IH07CiAgICAg c3BpbmxvY2tfdCAqbG9jayA9IHZjcHVfc2NoZWR1bGVfbG9ja19pcnEodik7CiAKLSAgICBTQ0hF RF9PUCh2Y3B1X3NjaGVkdWxlcih2KSwgeWllbGQsICZpdGVtKTsKKyAgICBTQ0hFRF9PUCh2Y3B1 X3NjaGVkdWxlcih2KSwgeWllbGQsIHYtPnNjaGVkX2l0ZW0pOwogICAgIHZjcHVfc2NoZWR1bGVf dW5sb2NrX2lycShsb2NrLCB2KTsKIAogICAgIFNDSEVEX1NUQVRfQ1JBTksodmNwdV95aWVsZCk7 CkBAIC0xNTQ3LDggKzE1NDcsNiBAQCBzdGF0aWMgdm9pZCBzY2hlZHVsZSh2b2lkKQogCiB2b2lk IGNvbnRleHRfc2F2ZWQoc3RydWN0IHZjcHUgKnByZXYpCiB7Ci0gICAgc3RydWN0IHNjaGVkX2l0 ZW0gaXRlbSA9IHsgLnZjcHUgPSBwcmV2IH07Ci0KICAgICAvKiBDbGVhciBydW5uaW5nIGZsYWcg L2FmdGVyLyB3cml0aW5nIGNvbnRleHQgdG8gbWVtb3J5LiAqLwogICAgIHNtcF93bWIoKTsKIApA QCAtMTU1Nyw3ICsxNTU1LDcgQEAgdm9pZCBjb250ZXh0X3NhdmVkKHN0cnVjdCB2Y3B1ICpwcmV2 KQogICAgIC8qIENoZWNrIGZvciBtaWdyYXRpb24gcmVxdWVzdCAvYWZ0ZXIvIGNsZWFyaW5nIHJ1 bm5pbmcgZmxhZy4gKi8KICAgICBzbXBfbWIoKTsKIAotICAgIFNDSEVEX09QKHZjcHVfc2NoZWR1 bGVyKHByZXYpLCBjb250ZXh0X3NhdmVkLCAmaXRlbSk7CisgICAgU0NIRURfT1AodmNwdV9zY2hl ZHVsZXIocHJldiksIGNvbnRleHRfc2F2ZWQsIHByZXYtPnNjaGVkX2l0ZW0pOwogCiAgICAgdmNw dV9taWdyYXRlX2ZpbmlzaChwcmV2KTsKIH0KQEAgLTE2MTMsNyArMTYxMSw2IEBAIHN0YXRpYyBp bnQgY3B1X3NjaGVkdWxlX3VwKHVuc2lnbmVkIGludCBjcHUpCiAgICAgZWxzZQogICAgIHsKICAg ICAgICAgc3RydWN0IHZjcHUgKmlkbGUgPSBpZGxlX3ZjcHVbY3B1XTsKLSAgICAgICAgc3RydWN0 IHNjaGVkX2l0ZW0gaXRlbSA9IHsgLnZjcHUgPSBpZGxlIH07CiAKICAgICAgICAgLyoKICAgICAg ICAgICogRHVyaW5nIChBQ1BJPykgc3VzcGVuZCB0aGUgaWRsZSB2Q1BVIGZvciB0aGlzIHBDUFUg aXMgbm90IGZyZWVkLApAQCAtMTYyNyw3ICsxNjI0LDcgQEAgc3RhdGljIGludCBjcHVfc2NoZWR1 bGVfdXAodW5zaWduZWQgaW50IGNwdSkKICAgICAgICAgICovCiAgICAgICAgIEFTU0VSVChpZGxl LT5zY2hlZF9wcml2ID09IE5VTEwpOwogCi0gICAgICAgIGlkbGUtPnNjaGVkX3ByaXYgPSBTQ0hF RF9PUCgmb3BzLCBhbGxvY192ZGF0YSwgJml0ZW0sCisgICAgICAgIGlkbGUtPnNjaGVkX3ByaXYg PSBTQ0hFRF9PUCgmb3BzLCBhbGxvY192ZGF0YSwgaWRsZS0+c2NoZWRfaXRlbSwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlkbGUtPmRvbWFpbi0+c2NoZWRfcHJpdik7CiAg ICAgICAgIGlmICggaWRsZS0+c2NoZWRfcHJpdiA9PSBOVUxMICkKICAgICAgICAgICAgIHJldHVy biAtRU5PTUVNOwpAQCAtMTgyMCw3ICsxODE3LDYgQEAgdm9pZCBfX2luaXQgc2NoZWR1bGVyX2lu aXQodm9pZCkKIGludCBzY2hlZHVsZV9jcHVfc3dpdGNoKHVuc2lnbmVkIGludCBjcHUsIHN0cnVj dCBjcHVwb29sICpjKQogewogICAgIHN0cnVjdCB2Y3B1ICppZGxlOwotICAgIHN0cnVjdCBzY2hl ZF9pdGVtIGl0ZW07CiAgICAgdm9pZCAqcHByaXYsICpwcHJpdl9vbGQsICp2cHJpdiwgKnZwcml2 X29sZDsKICAgICBzdHJ1Y3Qgc2NoZWR1bGVyICpvbGRfb3BzID0gcGVyX2NwdShzY2hlZHVsZXIs IGNwdSk7CiAgICAgc3RydWN0IHNjaGVkdWxlciAqbmV3X29wcyA9IChjID09IE5VTEwpID8gJm9w cyA6IGMtPnNjaGVkOwpAQCAtMTg1NiwxMSArMTg1MiwxMSBAQCBpbnQgc2NoZWR1bGVfY3B1X3N3 aXRjaCh1bnNpZ25lZCBpbnQgY3B1LCBzdHJ1Y3QgY3B1cG9vbCAqYykKICAgICAgKiAgICBzY2hl ZF9wcml2IGZpZWxkIG9mIHRoZSBwZXItdkNQVSBpbmZvIG9mIHRoZSBpZGxlIGRvbWFpbi4KICAg ICAgKi8KICAgICBpZGxlID0gaWRsZV92Y3B1W2NwdV07Ci0gICAgaXRlbS52Y3B1ID0gaWRsZTsK ICAgICBwcHJpdiA9IFNDSEVEX09QKG5ld19vcHMsIGFsbG9jX3BkYXRhLCBjcHUpOwogICAgIGlm ICggSVNfRVJSKHBwcml2KSApCiAgICAgICAgIHJldHVybiBQVFJfRVJSKHBwcml2KTsKLSAgICB2 cHJpdiA9IFNDSEVEX09QKG5ld19vcHMsIGFsbG9jX3ZkYXRhLCAmaXRlbSwgaWRsZS0+ZG9tYWlu LT5zY2hlZF9wcml2KTsKKyAgICB2cHJpdiA9IFNDSEVEX09QKG5ld19vcHMsIGFsbG9jX3ZkYXRh LCBpZGxlLT5zY2hlZF9pdGVtLAorICAgICAgICAgICAgICAgICAgICAgaWRsZS0+ZG9tYWluLT5z Y2hlZF9wcml2KTsKICAgICBpZiAoIHZwcml2ID09IE5VTEwgKQogICAgIHsKICAgICAgICAgU0NI RURfT1AobmV3X29wcywgZnJlZV9wZGF0YSwgcHByaXYsIGNwdSk7CmRpZmYgLS1naXQgYS94ZW4v aW5jbHVkZS94ZW4vc2NoZWQuaCBiL3hlbi9pbmNsdWRlL3hlbi9zY2hlZC5oCmluZGV4IGVkZWU1 MmRmZTQuLmM4YWEyOTE1YzQgMTAwNjQ0Ci0tLSBhL3hlbi9pbmNsdWRlL3hlbi9zY2hlZC5oCisr KyBiL3hlbi9pbmNsdWRlL3hlbi9zY2hlZC5oCkBAIC0xNDAsNiArMTQwLDcgQEAgdm9pZCBldnRj aG5fZGVzdHJveShzdHJ1Y3QgZG9tYWluICpkKTsgLyogZnJvbSBkb21haW5fa2lsbCAqLwogdm9p ZCBldnRjaG5fZGVzdHJveV9maW5hbChzdHJ1Y3QgZG9tYWluICpkKTsgLyogZnJvbSBjb21wbGV0 ZV9kb21haW5fZGVzdHJveSAqLwogCiBzdHJ1Y3Qgd2FpdHF1ZXVlX3ZjcHU7CitzdHJ1Y3Qgc2No ZWRfaXRlbTsKIAogc3RydWN0IHZjcHUKIHsKQEAgLTE2MCw2ICsxNjEsNyBAQCBzdHJ1Y3QgdmNw dQogCiAgICAgc3RydWN0IHRpbWVyICAgICBwb2xsX3RpbWVyOyAgICAvKiB0aW1lb3V0IGZvciBT Q0hFRE9QX3BvbGwgKi8KIAorICAgIHN0cnVjdCBzY2hlZF9pdGVtICpzY2hlZF9pdGVtOwogICAg IHZvaWQgICAgICAgICAgICAqc2NoZWRfcHJpdjsgICAgLyogc2NoZWR1bGVyLXNwZWNpZmljIGRh dGEgKi8KIAogICAgIHN0cnVjdCB2Y3B1X3J1bnN0YXRlX2luZm8gcnVuc3RhdGU7Ci0tIAoyLjE2 LjQKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4t ZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczov L2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs