From mboxrd@z Thu Jan 1 00:00:00 1970 From: Juergen Gross Subject: [PATCH RFC 10/49] xen/sched: move per-vcpu scheduler private data pointer to sched_item Date: Fri, 29 Mar 2019 16:08:55 +0100 Message-ID: <20190329150934.17694-11-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 us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1h9t8a-0003VE-CJ for xen-devel@lists.xenproject.org; Fri, 29 Mar 2019 15:09:44 +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 , Robert VanVossen , Dario Faggioli , Julien Grall , Josh Whitehead , Meng Xu , Jan Beulich List-Id: xen-devel@lists.xenproject.org VGhpcyBwcmVwYXJlcyBtYWtpbmcgdGhlIGRpZmZlcmVudCBzY2hlZHVsZXJzIHZjcHUgYWdub3N0 aWMuCgpTaWduZWQtb2ZmLWJ5OiBKdWVyZ2VuIEdyb3NzIDxqZ3Jvc3NAc3VzZS5jb20+Ci0tLQog eGVuL2NvbW1vbi9zY2hlZF9hcmluYzY1My5jIHwgIDQgKystLQogeGVuL2NvbW1vbi9zY2hlZF9j cmVkaXQuYyAgIHwgIDYgKysrLS0tCiB4ZW4vY29tbW9uL3NjaGVkX2NyZWRpdDIuYyAgfCAxMCAr KysrKy0tLS0tCiB4ZW4vY29tbW9uL3NjaGVkX251bGwuYyAgICAgfCAgNCArKy0tCiB4ZW4vY29t bW9uL3NjaGVkX3J0LmMgICAgICAgfCAgNCArKy0tCiB4ZW4vY29tbW9uL3NjaGVkdWxlLmMgICAg ICAgfCAyNSArKysrKysrKysrKystLS0tLS0tLS0tLS0tCiB4ZW4vaW5jbHVkZS94ZW4vc2NoZWQt aWYuaCAgfCAgMSArCiB4ZW4vaW5jbHVkZS94ZW4vc2NoZWQuaCAgICAgfCAgMSAtCiA4IGZpbGVz IGNoYW5nZWQsIDI3IGluc2VydGlvbnMoKyksIDI4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L3hlbi9jb21tb24vc2NoZWRfYXJpbmM2NTMuYyBiL3hlbi9jb21tb24vc2NoZWRfYXJpbmM2NTMu YwppbmRleCBmZmZlMjMxMTNlLi5mNWFmOGI5NzJkIDEwMDY0NAotLS0gYS94ZW4vY29tbW9uL3Nj aGVkX2FyaW5jNjUzLmMKKysrIGIveGVuL2NvbW1vbi9zY2hlZF9hcmluYzY1My5jCkBAIC01Myw3 ICs1Myw3IEBACiAgKiBSZXR1cm4gYSBwb2ludGVyIHRvIHRoZSBBUklOQyA2NTMtc3BlY2lmaWMg c2NoZWR1bGVyIGRhdGEgaW5mb3JtYXRpb24KICAqIGFzc29jaWF0ZWQgd2l0aCB0aGUgZ2l2ZW4g VkNQVSAodmMpCiAgKi8KLSNkZWZpbmUgQVZDUFUodmMpICgoYXJpbmM2NTNfdmNwdV90ICopKHZj KS0+c2NoZWRfcHJpdikKKyNkZWZpbmUgQVZDUFUodmMpICgoYXJpbmM2NTNfdmNwdV90ICopKHZj KS0+c2NoZWRfaXRlbS0+cHJpdikKIAogLyoqCiAgKiBSZXR1cm4gdGhlIGdsb2JhbCBzY2hlZHVs ZXIgcHJpdmF0ZSBkYXRhIGdpdmVuIHRoZSBzY2hlZHVsZXIgb3BzIHBvaW50ZXIKQEAgLTY0Nyw3 ICs2NDcsNyBAQCBhNjUzX3N3aXRjaF9zY2hlZChzdHJ1Y3Qgc2NoZWR1bGVyICpuZXdfb3BzLCB1 bnNpZ25lZCBpbnQgY3B1LAogCiAgICAgQVNTRVJUKCFwZGF0YSAmJiBzdmMgJiYgaXNfaWRsZV92 Y3B1KHN2Yy0+dmMpKTsKIAotICAgIGlkbGVfdmNwdVtjcHVdLT5zY2hlZF9wcml2ID0gdmRhdGE7 CisgICAgaWRsZV92Y3B1W2NwdV0tPnNjaGVkX2l0ZW0tPnByaXYgPSB2ZGF0YTsKIAogICAgIHBl cl9jcHUoc2NoZWR1bGVyLCBjcHUpID0gbmV3X29wczsKICAgICBwZXJfY3B1KHNjaGVkdWxlX2Rh dGEsIGNwdSkuc2NoZWRfcHJpdiA9IE5VTEw7IC8qIG5vIHBkYXRhICovCmRpZmYgLS1naXQgYS94 ZW4vY29tbW9uL3NjaGVkX2NyZWRpdC5jIGIveGVuL2NvbW1vbi9zY2hlZF9jcmVkaXQuYwppbmRl eCAzNzM1NDg2YjRjLi5jYjhlMTY3ZmM5IDEwMDY0NAotLS0gYS94ZW4vY29tbW9uL3NjaGVkX2Ny ZWRpdC5jCisrKyBiL3hlbi9jb21tb24vc2NoZWRfY3JlZGl0LmMKQEAgLTgzLDcgKzgzLDcgQEAK ICAgICAoKHN0cnVjdCBjc2NoZWRfcHJpdmF0ZSAqKSgoX29wcyktPnNjaGVkX2RhdGEpKQogI2Rl ZmluZSBDU0NIRURfUENQVShfYykgICAgIFwKICAgICAoKHN0cnVjdCBjc2NoZWRfcGNwdSAqKXBl cl9jcHUoc2NoZWR1bGVfZGF0YSwgX2MpLnNjaGVkX3ByaXYpCi0jZGVmaW5lIENTQ0hFRF9WQ1BV KF92Y3B1KSAgKChzdHJ1Y3QgY3NjaGVkX3ZjcHUgKikgKF92Y3B1KS0+c2NoZWRfcHJpdikKKyNk ZWZpbmUgQ1NDSEVEX1ZDUFUoX3ZjcHUpICAoKHN0cnVjdCBjc2NoZWRfdmNwdSAqKSAoX3ZjcHUp LT5zY2hlZF9pdGVtLT5wcml2KQogI2RlZmluZSBDU0NIRURfRE9NKF9kb20pICAgICgoc3RydWN0 IGNzY2hlZF9kb20gKikgKF9kb20pLT5zY2hlZF9wcml2KQogI2RlZmluZSBSVU5RKF9jcHUpICAg ICAgICAgICgmKENTQ0hFRF9QQ1BVKF9jcHUpLT5ydW5xKSkKIApAQCAtNjQxLDcgKzY0MSw3IEBA IGNzY2hlZF9zd2l0Y2hfc2NoZWQoc3RydWN0IHNjaGVkdWxlciAqbmV3X29wcywgdW5zaWduZWQg aW50IGNwdSwKIAogICAgIEFTU0VSVChzdmMgJiYgaXNfaWRsZV92Y3B1KHN2Yy0+dmNwdSkpOwog Ci0gICAgaWRsZV92Y3B1W2NwdV0tPnNjaGVkX3ByaXYgPSB2ZGF0YTsKKyAgICBpZGxlX3ZjcHVb Y3B1XS0+c2NoZWRfaXRlbS0+cHJpdiA9IHZkYXRhOwogCiAgICAgLyoKICAgICAgKiBXZSBhcmUg aG9sZGluZyB0aGUgcnVucXVldWUgbG9jayBhbHJlYWR5IChpdCdzIGJlZW4gdGFrZW4gaW4KQEAg LTEwMzEsNyArMTAzMSw3IEBAIHN0YXRpYyB2b2lkCiBjc2NoZWRfaXRlbV9pbnNlcnQoY29uc3Qg c3RydWN0IHNjaGVkdWxlciAqb3BzLCBzdHJ1Y3Qgc2NoZWRfaXRlbSAqaXRlbSkKIHsKICAgICBz dHJ1Y3QgdmNwdSAqdmMgPSBpdGVtLT52Y3B1OwotICAgIHN0cnVjdCBjc2NoZWRfdmNwdSAqc3Zj ID0gdmMtPnNjaGVkX3ByaXY7CisgICAgc3RydWN0IGNzY2hlZF92Y3B1ICpzdmMgPSBpdGVtLT5w cml2OwogICAgIHNwaW5sb2NrX3QgKmxvY2s7CiAKICAgICBCVUdfT04oIGlzX2lkbGVfdmNwdSh2 YykgKTsKZGlmZiAtLWdpdCBhL3hlbi9jb21tb24vc2NoZWRfY3JlZGl0Mi5jIGIveGVuL2NvbW1v bi9zY2hlZF9jcmVkaXQyLmMKaW5kZXggZjQ0Mjg2YzJhNS4uOWMwNTJjMjRhNyAxMDA2NDQKLS0t IGEveGVuL2NvbW1vbi9zY2hlZF9jcmVkaXQyLmMKKysrIGIveGVuL2NvbW1vbi9zY2hlZF9jcmVk aXQyLmMKQEAgLTU3Miw3ICs1NzIsNyBAQCBzdGF0aWMgaW5saW5lIHN0cnVjdCBjc2NoZWQyX3Bj cHUgKmNzY2hlZDJfcGNwdSh1bnNpZ25lZCBpbnQgY3B1KQogCiBzdGF0aWMgaW5saW5lIHN0cnVj dCBjc2NoZWQyX3ZjcHUgKmNzY2hlZDJfdmNwdShjb25zdCBzdHJ1Y3QgdmNwdSAqdikKIHsKLSAg ICByZXR1cm4gdi0+c2NoZWRfcHJpdjsKKyAgICByZXR1cm4gdi0+c2NoZWRfaXRlbS0+cHJpdjsK IH0KIAogc3RhdGljIGlubGluZSBzdHJ1Y3QgY3NjaGVkMl9kb20gKmNzY2hlZDJfZG9tKGNvbnN0 IHN0cnVjdCBkb21haW4gKmQpCkBAIC05NzAsNyArOTcwLDcgQEAgX3J1bnFfYXNzaWduKHN0cnVj dCBjc2NoZWQyX3ZjcHUgKnN2Yywgc3RydWN0IGNzY2hlZDJfcnVucXVldWVfZGF0YSAqcnFkKQog c3RhdGljIHZvaWQKIHJ1bnFfYXNzaWduKGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywgc3Ry dWN0IHZjcHUgKnZjKQogewotICAgIHN0cnVjdCBjc2NoZWQyX3ZjcHUgKnN2YyA9IHZjLT5zY2hl ZF9wcml2OworICAgIHN0cnVjdCBjc2NoZWQyX3ZjcHUgKnN2YyA9IHZjLT5zY2hlZF9pdGVtLT5w cml2OwogCiAgICAgQVNTRVJUKHN2Yy0+cnFkID09IE5VTEwpOwogCkBAIC05OTcsNyArOTk3LDcg QEAgX3J1bnFfZGVhc3NpZ24oc3RydWN0IGNzY2hlZDJfdmNwdSAqc3ZjKQogc3RhdGljIHZvaWQK IHJ1bnFfZGVhc3NpZ24oY29uc3Qgc3RydWN0IHNjaGVkdWxlciAqb3BzLCBzdHJ1Y3QgdmNwdSAq dmMpCiB7Ci0gICAgc3RydWN0IGNzY2hlZDJfdmNwdSAqc3ZjID0gdmMtPnNjaGVkX3ByaXY7Cisg ICAgc3RydWN0IGNzY2hlZDJfdmNwdSAqc3ZjID0gdmMtPnNjaGVkX2l0ZW0tPnByaXY7CiAKICAg ICBBU1NFUlQoc3ZjLT5ycWQgPT0gYzJycWQob3BzLCB2Yy0+cHJvY2Vzc29yKSk7CiAKQEAgLTMx MDgsNyArMzEwOCw3IEBAIHN0YXRpYyB2b2lkCiBjc2NoZWQyX2l0ZW1faW5zZXJ0KGNvbnN0IHN0 cnVjdCBzY2hlZHVsZXIgKm9wcywgc3RydWN0IHNjaGVkX2l0ZW0gKml0ZW0pCiB7CiAgICAgc3Ry dWN0IHZjcHUgKnZjID0gaXRlbS0+dmNwdTsKLSAgICBzdHJ1Y3QgY3NjaGVkMl92Y3B1ICpzdmMg PSB2Yy0+c2NoZWRfcHJpdjsKKyAgICBzdHJ1Y3QgY3NjaGVkMl92Y3B1ICpzdmMgPSBpdGVtLT5w cml2OwogICAgIHN0cnVjdCBjc2NoZWQyX2RvbSAqIGNvbnN0IHNkb20gPSBzdmMtPnNkb207CiAg ICAgc3BpbmxvY2tfdCAqbG9jazsKIApAQCAtMzg4OCw3ICszODg4LDcgQEAgY3NjaGVkMl9zd2l0 Y2hfc2NoZWQoc3RydWN0IHNjaGVkdWxlciAqbmV3X29wcywgdW5zaWduZWQgaW50IGNwdSwKICAg ICBBU1NFUlQoIWxvY2FsX2lycV9pc19lbmFibGVkKCkpOwogICAgIHdyaXRlX2xvY2soJnBydi0+ bG9jayk7CiAKLSAgICBpZGxlX3ZjcHVbY3B1XS0+c2NoZWRfcHJpdiA9IHZkYXRhOworICAgIGlk bGVfdmNwdVtjcHVdLT5zY2hlZF9pdGVtLT5wcml2ID0gdmRhdGE7CiAKICAgICBycWkgPSBpbml0 X3BkYXRhKHBydiwgcGRhdGEsIGNwdSk7CiAKZGlmZiAtLWdpdCBhL3hlbi9jb21tb24vc2NoZWRf bnVsbC5jIGIveGVuL2NvbW1vbi9zY2hlZF9udWxsLmMKaW5kZXggN2I1MDhmMzVhNC4uZWI1MWRk YmNjYiAxMDA2NDQKLS0tIGEveGVuL2NvbW1vbi9zY2hlZF9udWxsLmMKKysrIGIveGVuL2NvbW1v bi9zY2hlZF9udWxsLmMKQEAgLTExNyw3ICsxMTcsNyBAQCBzdGF0aWMgaW5saW5lIHN0cnVjdCBu dWxsX3ByaXZhdGUgKm51bGxfcHJpdihjb25zdCBzdHJ1Y3Qgc2NoZWR1bGVyICpvcHMpCiAKIHN0 YXRpYyBpbmxpbmUgc3RydWN0IG51bGxfdmNwdSAqbnVsbF92Y3B1KGNvbnN0IHN0cnVjdCB2Y3B1 ICp2KQogewotICAgIHJldHVybiB2LT5zY2hlZF9wcml2OworICAgIHJldHVybiB2LT5zY2hlZF9p dGVtLT5wcml2OwogfQogCiBzdGF0aWMgaW5saW5lIGJvb2wgdmNwdV9jaGVja19hZmZpbml0eShz dHJ1Y3QgdmNwdSAqdiwgdW5zaWduZWQgaW50IGNwdSwKQEAgLTM5MSw3ICszOTEsNyBAQCBzdGF0 aWMgdm9pZCBudWxsX3N3aXRjaF9zY2hlZChzdHJ1Y3Qgc2NoZWR1bGVyICpuZXdfb3BzLCB1bnNp Z25lZCBpbnQgY3B1LAogCiAgICAgQVNTRVJUKG52YyAmJiBpc19pZGxlX3ZjcHUobnZjLT52Y3B1 KSk7CiAKLSAgICBpZGxlX3ZjcHVbY3B1XS0+c2NoZWRfcHJpdiA9IHZkYXRhOworICAgIGlkbGVf dmNwdVtjcHVdLT5zY2hlZF9pdGVtLT5wcml2ID0gdmRhdGE7CiAKICAgICAvKgogICAgICAqIFdl IGFyZSBob2xkaW5nIHRoZSBydW5xdWV1ZSBsb2NrIGFscmVhZHkgKGl0J3MgYmVlbiB0YWtlbiBp bgpkaWZmIC0tZ2l0IGEveGVuL2NvbW1vbi9zY2hlZF9ydC5jIGIveGVuL2NvbW1vbi9zY2hlZF9y dC5jCmluZGV4IGFiOGZhMDIzMDYuLmM4MzBhYWM5MmYgMTAwNjQ0Ci0tLSBhL3hlbi9jb21tb24v c2NoZWRfcnQuYworKysgYi94ZW4vY29tbW9uL3NjaGVkX3J0LmMKQEAgLTIzNSw3ICsyMzUsNyBA QCBzdGF0aWMgaW5saW5lIHN0cnVjdCBydF9wcml2YXRlICpydF9wcml2KGNvbnN0IHN0cnVjdCBz Y2hlZHVsZXIgKm9wcykKIAogc3RhdGljIGlubGluZSBzdHJ1Y3QgcnRfdmNwdSAqcnRfdmNwdShj b25zdCBzdHJ1Y3QgdmNwdSAqdmNwdSkKIHsKLSAgICByZXR1cm4gdmNwdS0+c2NoZWRfcHJpdjsK KyAgICByZXR1cm4gdmNwdS0+c2NoZWRfaXRlbS0+cHJpdjsKIH0KIAogc3RhdGljIGlubGluZSBz dHJ1Y3QgbGlzdF9oZWFkICpydF9ydW5xKGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9wcykKQEAg LTc2MSw3ICs3NjEsNyBAQCBydF9zd2l0Y2hfc2NoZWQoc3RydWN0IHNjaGVkdWxlciAqbmV3X29w cywgdW5zaWduZWQgaW50IGNwdSwKICAgICAgICAgZHByaW50ayhYRU5MT0dfREVCVUcsICJSVERT OiB0aW1lciBpbml0aWFsaXplZCBvbiBjcHUgJXVcbiIsIGNwdSk7CiAgICAgfQogCi0gICAgaWRs ZV92Y3B1W2NwdV0tPnNjaGVkX3ByaXYgPSB2ZGF0YTsKKyAgICBpZGxlX3ZjcHVbY3B1XS0+c2No ZWRfaXRlbS0+cHJpdiA9IHZkYXRhOwogICAgIHBlcl9jcHUoc2NoZWR1bGVyLCBjcHUpID0gbmV3 X29wczsKICAgICBwZXJfY3B1KHNjaGVkdWxlX2RhdGEsIGNwdSkuc2NoZWRfcHJpdiA9IE5VTEw7 IC8qIG5vIHBkYXRhICovCiAKZGlmZiAtLWdpdCBhL3hlbi9jb21tb24vc2NoZWR1bGUuYyBiL3hl bi9jb21tb24vc2NoZWR1bGUuYwppbmRleCAyYjdkNjJlZGU3Li44MTlhNzhiNjQ2IDEwMDY0NAot LS0gYS94ZW4vY29tbW9uL3NjaGVkdWxlLmMKKysrIGIveGVuL2NvbW1vbi9zY2hlZHVsZS5jCkBA IC0yNzMsOSArMjczLDggQEAgaW50IHNjaGVkX2luaXRfdmNwdShzdHJ1Y3QgdmNwdSAqdiwgdW5z aWduZWQgaW50IHByb2Nlc3NvcikKICAgICBpbml0X3RpbWVyKCZ2LT5wb2xsX3RpbWVyLCBwb2xs X3RpbWVyX2ZuLAogICAgICAgICAgICAgICAgdiwgdi0+cHJvY2Vzc29yKTsKIAotICAgIHYtPnNj aGVkX3ByaXYgPSBTQ0hFRF9PUChkb21fc2NoZWR1bGVyKGQpLCBhbGxvY192ZGF0YSwgaXRlbSwK LSAgICAgICAgICAgICAgICAgICAgIGQtPnNjaGVkX3ByaXYpOwotICAgIGlmICggdi0+c2NoZWRf cHJpdiA9PSBOVUxMICkKKyAgICBpdGVtLT5wcml2ID0gU0NIRURfT1AoZG9tX3NjaGVkdWxlcihk KSwgYWxsb2NfdmRhdGEsIGl0ZW0sIGQtPnNjaGVkX3ByaXYpOworICAgIGlmICggaXRlbS0+cHJp diA9PSBOVUxMICkKICAgICB7CiAgICAgICAgIHYtPnNjaGVkX2l0ZW0gPSBOVUxMOwogICAgICAg ICB4ZnJlZShpdGVtKTsKQEAgLTM3MCw3ICszNjksNyBAQCBpbnQgc2NoZWRfbW92ZV9kb21haW4o c3RydWN0IGRvbWFpbiAqZCwgc3RydWN0IGNwdXBvb2wgKmMpCiAgICAgewogICAgICAgICBzcGlu bG9ja190ICpsb2NrOwogCi0gICAgICAgIHZjcHVkYXRhID0gdi0+c2NoZWRfcHJpdjsKKyAgICAg ICAgdmNwdWRhdGEgPSB2LT5zY2hlZF9pdGVtLT5wcml2OwogCiAgICAgICAgIG1pZ3JhdGVfdGlt ZXIoJnYtPnBlcmlvZGljX3RpbWVyLCBuZXdfcCk7CiAgICAgICAgIG1pZ3JhdGVfdGltZXIoJnYt PnNpbmdsZXNob3RfdGltZXIsIG5ld19wKTsKQEAgLTM4OCw3ICszODcsNyBAQCBpbnQgc2NoZWRf bW92ZV9kb21haW4oc3RydWN0IGRvbWFpbiAqZCwgc3RydWN0IGNwdXBvb2wgKmMpCiAgICAgICAg ICAqLwogICAgICAgICBzcGluX3VubG9ja19pcnEobG9jayk7CiAKLSAgICAgICAgdi0+c2NoZWRf cHJpdiA9IHZjcHVfcHJpdlt2LT52Y3B1X2lkXTsKKyAgICAgICAgdi0+c2NoZWRfaXRlbS0+cHJp diA9IHZjcHVfcHJpdlt2LT52Y3B1X2lkXTsKICAgICAgICAgaWYgKCAhZC0+aXNfZHlpbmcgKQog ICAgICAgICAgICAgc2NoZWRfbW92ZV9pcnFzKHYpOwogCkBAIC00MjAsNyArNDE5LDcgQEAgdm9p ZCBzY2hlZF9kZXN0cm95X3ZjcHUoc3RydWN0IHZjcHUgKnYpCiAgICAgaWYgKCB0ZXN0X2FuZF9j bGVhcl9ib29sKHYtPmlzX3VyZ2VudCkgKQogICAgICAgICBhdG9taWNfZGVjKCZwZXJfY3B1KHNj aGVkdWxlX2RhdGEsIHYtPnByb2Nlc3NvcikudXJnZW50X2NvdW50KTsKICAgICBTQ0hFRF9PUCh2 Y3B1X3NjaGVkdWxlcih2KSwgcmVtb3ZlX2l0ZW0sIGl0ZW0pOwotICAgIFNDSEVEX09QKHZjcHVf c2NoZWR1bGVyKHYpLCBmcmVlX3ZkYXRhLCB2LT5zY2hlZF9wcml2KTsKKyAgICBTQ0hFRF9PUCh2 Y3B1X3NjaGVkdWxlcih2KSwgZnJlZV92ZGF0YSwgaXRlbS0+cHJpdik7CiAgICAgeGZyZWUoaXRl bSk7CiAgICAgdi0+c2NoZWRfaXRlbSA9IE5VTEw7CiB9CkBAIC0xNjExLDYgKzE2MTAsNyBAQCBz dGF0aWMgaW50IGNwdV9zY2hlZHVsZV91cCh1bnNpZ25lZCBpbnQgY3B1KQogICAgIGVsc2UKICAg ICB7CiAgICAgICAgIHN0cnVjdCB2Y3B1ICppZGxlID0gaWRsZV92Y3B1W2NwdV07CisgICAgICAg IHN0cnVjdCBzY2hlZF9pdGVtICppdGVtID0gaWRsZS0+c2NoZWRfaXRlbTsKIAogICAgICAgICAv KgogICAgICAgICAgKiBEdXJpbmcgKEFDUEk/KSBzdXNwZW5kIHRoZSBpZGxlIHZDUFUgZm9yIHRo aXMgcENQVSBpcyBub3QgZnJlZWQsCkBAIC0xNjIyLDExICsxNjIyLDEwIEBAIHN0YXRpYyBpbnQg Y3B1X3NjaGVkdWxlX3VwKHVuc2lnbmVkIGludCBjcHUpCiAgICAgICAgICAqIHdpdGggYSBkaWZm ZXJlbnQgc2NoZWR1bGVyLCBpdCBpcyBzY2hlZHVsZV9jcHVfc3dpdGNoKCksIGludm9rZWQKICAg ICAgICAgICogbGF0ZXIsIHRoYXQgd2lsbCBzZXQgdGhpbmdzIHVwIGFzIGFwcHJvcHJpYXRlLgog ICAgICAgICAgKi8KLSAgICAgICAgQVNTRVJUKGlkbGUtPnNjaGVkX3ByaXYgPT0gTlVMTCk7Cisg ICAgICAgIEFTU0VSVChpdGVtLT5wcml2ID09IE5VTEwpOwogCi0gICAgICAgIGlkbGUtPnNjaGVk X3ByaXYgPSBTQ0hFRF9PUCgmb3BzLCBhbGxvY192ZGF0YSwgaWRsZS0+c2NoZWRfaXRlbSwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlkbGUtPmRvbWFpbi0+c2NoZWRfcHJp dik7Ci0gICAgICAgIGlmICggaWRsZS0+c2NoZWRfcHJpdiA9PSBOVUxMICkKKyAgICAgICAgaXRl bS0+cHJpdiA9IFNDSEVEX09QKCZvcHMsIGFsbG9jX3ZkYXRhLCBpdGVtLCBpZGxlLT5kb21haW4t PnNjaGVkX3ByaXYpOworICAgICAgICBpZiAoIGl0ZW0tPnByaXYgPT0gTlVMTCApCiAgICAgICAg ICAgICByZXR1cm4gLUVOT01FTTsKICAgICB9CiAgICAgaWYgKCBpZGxlX3ZjcHVbY3B1XSA9PSBO VUxMICkKQEAgLTE2NTIsOSArMTY1MSw5IEBAIHN0YXRpYyB2b2lkIGNwdV9zY2hlZHVsZV9kb3du KHVuc2lnbmVkIGludCBjcHUpCiAgICAgc3RydWN0IHNjaGVkdWxlciAqc2NoZWQgPSBwZXJfY3B1 KHNjaGVkdWxlciwgY3B1KTsKIAogICAgIFNDSEVEX09QKHNjaGVkLCBmcmVlX3BkYXRhLCBzZC0+ c2NoZWRfcHJpdiwgY3B1KTsKLSAgICBTQ0hFRF9PUChzY2hlZCwgZnJlZV92ZGF0YSwgaWRsZV92 Y3B1W2NwdV0tPnNjaGVkX3ByaXYpOworICAgIFNDSEVEX09QKHNjaGVkLCBmcmVlX3ZkYXRhLCBp ZGxlX3ZjcHVbY3B1XS0+c2NoZWRfaXRlbS0+cHJpdik7CiAKLSAgICBpZGxlX3ZjcHVbY3B1XS0+ c2NoZWRfcHJpdiA9IE5VTEw7CisgICAgaWRsZV92Y3B1W2NwdV0tPnNjaGVkX2l0ZW0tPnByaXYg PSBOVUxMOwogICAgIHNkLT5zY2hlZF9wcml2ID0gTlVMTDsKIAogICAgIGtpbGxfdGltZXIoJnNk LT5zX3RpbWVyKTsKQEAgLTE4NzksNyArMTg3OCw3IEBAIGludCBzY2hlZHVsZV9jcHVfc3dpdGNo KHVuc2lnbmVkIGludCBjcHUsIHN0cnVjdCBjcHVwb29sICpjKQogICAgICAqLwogICAgIG9sZF9s b2NrID0gcGNwdV9zY2hlZHVsZV9sb2NrX2lycShjcHUpOwogCi0gICAgdnByaXZfb2xkID0gaWRs ZS0+c2NoZWRfcHJpdjsKKyAgICB2cHJpdl9vbGQgPSBpZGxlLT5zY2hlZF9pdGVtLT5wcml2Owog ICAgIHBwcml2X29sZCA9IHBlcl9jcHUoc2NoZWR1bGVfZGF0YSwgY3B1KS5zY2hlZF9wcml2Owog ICAgIFNDSEVEX09QKG5ld19vcHMsIHN3aXRjaF9zY2hlZCwgY3B1LCBwcHJpdiwgdnByaXYpOwog CmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS94ZW4vc2NoZWQtaWYuaCBiL3hlbi9pbmNsdWRlL3hl bi9zY2hlZC1pZi5oCmluZGV4IGE5OTE2ZjM1YjguLjFmZTg3YTczYjQgMTAwNjQ0Ci0tLSBhL3hl bi9pbmNsdWRlL3hlbi9zY2hlZC1pZi5oCisrKyBiL3hlbi9pbmNsdWRlL3hlbi9zY2hlZC1pZi5o CkBAIC01MCw2ICs1MCw3IEBAIERFQ0xBUkVfUEVSX0NQVShzdHJ1Y3QgY3B1cG9vbCAqLCBjcHVw b29sKTsKIAogc3RydWN0IHNjaGVkX2l0ZW0gewogICAgIHN0cnVjdCB2Y3B1ICAgICAgICAgICAq dmNwdTsKKyAgICB2b2lkICAgICAgICAgICAgICAgICAgKnByaXY7ICAgICAgLyogc2NoZWR1bGVy IHByaXZhdGUgZGF0YSAqLwogfTsKIAogLyoKZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL3hlbi9z Y2hlZC5oIGIveGVuL2luY2x1ZGUveGVuL3NjaGVkLmgKaW5kZXggYzhhYTI5MTVjNC4uNmFjZGMw ZjViZSAxMDA2NDQKLS0tIGEveGVuL2luY2x1ZGUveGVuL3NjaGVkLmgKKysrIGIveGVuL2luY2x1 ZGUveGVuL3NjaGVkLmgKQEAgLTE2Miw3ICsxNjIsNiBAQCBzdHJ1Y3QgdmNwdQogICAgIHN0cnVj dCB0aW1lciAgICAgcG9sbF90aW1lcjsgICAgLyogdGltZW91dCBmb3IgU0NIRURPUF9wb2xsICov CiAKICAgICBzdHJ1Y3Qgc2NoZWRfaXRlbSAqc2NoZWRfaXRlbTsKLSAgICB2b2lkICAgICAgICAg ICAgKnNjaGVkX3ByaXY7ICAgIC8qIHNjaGVkdWxlci1zcGVjaWZpYyBkYXRhICovCiAKICAgICBz dHJ1Y3QgdmNwdV9ydW5zdGF0ZV9pbmZvIHJ1bnN0YXRlOwogI2lmbmRlZiBDT05GSUdfQ09NUEFU Ci0tIAoyLjE2LjQKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9y ZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs