From: Juergen Gross Subject: [PATCH RFC V2 07/45] xen/sched: let pick_cpu return a scheduler resource Date: Mon, 6 May 2019 08:56:06 +0200 Message-ID: <20190506065644.7415-8-jgross@suse.com> References: <20190506065644.7415-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 1hNXYV-0001sn-G4 for xen-devel@lists.xenproject.org; Mon, 06 May 2019 06:56:55 +0000 In-Reply-To: <20190506065644.7415-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 SW5zdGVhZCBvZiByZXR1cm5pbmcgYSBwaHlzaWNhbCBjcHUgbnVtYmVyIGxldCBwaWNrX2NwdSgp IHJldHVybiBhCnNjaGVkdWxlciByZXNvdXJjZSBpbnN0ZWFkLiBSZW5hbWUgcGlja19jcHUoKSB0 byBwaWNrX3Jlc291cmNlKCkgdG8KcmVmbGVjdCB0aGF0IGNoYW5nZS4KClNpZ25lZC1vZmYtYnk6 IEp1ZXJnZW4gR3Jvc3MgPGpncm9zc0BzdXNlLmNvbT4KLS0tCiB4ZW4vY29tbW9uL3NjaGVkX2Fy aW5jNjUzLmMgIHwgMTIgKysrKysrLS0tLS0tCiB4ZW4vY29tbW9uL3NjaGVkX2NyZWRpdC5jICAg IHwgMTYgKysrKysrKystLS0tLS0tLQogeGVuL2NvbW1vbi9zY2hlZF9jcmVkaXQyLmMgICB8IDIy ICsrKysrKysrKysrLS0tLS0tLS0tLS0KIHhlbi9jb21tb24vc2NoZWRfbnVsbC5jICAgICAgfCAy MCArKysrKysrKysrKy0tLS0tLS0tLQogeGVuL2NvbW1vbi9zY2hlZF9ydC5jICAgICAgICB8IDE4 ICsrKysrKysrKy0tLS0tLS0tLQogeGVuL2NvbW1vbi9zY2hlZHVsZS5jICAgICAgICB8ICA4ICsr KysrLS0tCiB4ZW4vaW5jbHVkZS94ZW4vcGVyZmNfZGVmbi5oIHwgIDIgKy0KIHhlbi9pbmNsdWRl L3hlbi9zY2hlZC1pZi5oICAgfCAxMiArKysrKystLS0tLS0KIDggZmlsZXMgY2hhbmdlZCwgNTcg aW5zZXJ0aW9ucygrKSwgNTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2NvbW1vbi9z Y2hlZF9hcmluYzY1My5jIGIveGVuL2NvbW1vbi9zY2hlZF9hcmluYzY1My5jCmluZGV4IGY1YWY4 Yjk3MmQuLmE3NzViZTRjYmMgMTAwNjQ0Ci0tLSBhL3hlbi9jb21tb24vc2NoZWRfYXJpbmM2NTMu YworKysgYi94ZW4vY29tbW9uL3NjaGVkX2FyaW5jNjUzLmMKQEAgLTYwMSwxNSArNjAxLDE1IEBA IGE2NTNzY2hlZF9kb19zY2hlZHVsZSgKIH0KIAogLyoqCi0gKiBYZW4gc2NoZWR1bGVyIGNhbGxi YWNrIGZ1bmN0aW9uIHRvIHNlbGVjdCBhIENQVSBmb3IgdGhlIFZDUFUgdG8gcnVuIG9uCisgKiBY ZW4gc2NoZWR1bGVyIGNhbGxiYWNrIGZ1bmN0aW9uIHRvIHNlbGVjdCBhIHJlc291cmNlIGZvciB0 aGUgVkNQVSB0byBydW4gb24KICAqCiAgKiBAcGFyYW0gb3BzICAgICAgIFBvaW50ZXIgdG8gdGhp cyBpbnN0YW5jZSBvZiB0aGUgc2NoZWR1bGVyIHN0cnVjdHVyZQogICogQHBhcmFtIGl0ZW0gICAg ICBQb2ludGVyIHRvIHN0cnVjdCBzY2hlZF9pdGVtCiAgKgotICogQHJldHVybiAgICAgICAgICBO dW1iZXIgb2Ygc2VsZWN0ZWQgcGh5c2ljYWwgQ1BVCisgKiBAcmV0dXJuICAgICAgICAgIFNjaGVk dWxlciByZXNvdXJjZSB0byBydW4gb24KICAqLwotc3RhdGljIGludAotYTY1M3NjaGVkX3BpY2tf Y3B1KGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywgc3RydWN0IHNjaGVkX2l0ZW0gKml0ZW0p CitzdGF0aWMgc3RydWN0IHNjaGVkX3Jlc291cmNlICoKK2E2NTNzY2hlZF9waWNrX3Jlc291cmNl KGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywgc3RydWN0IHNjaGVkX2l0ZW0gKml0ZW0pCiB7 CiAgICAgc3RydWN0IHZjcHUgKnZjID0gaXRlbS0+dmNwdTsKICAgICBjcHVtYXNrX3QgKm9ubGlu ZTsKQEAgLTYyNyw3ICs2MjcsNyBAQCBhNjUzc2NoZWRfcGlja19jcHUoY29uc3Qgc3RydWN0IHNj aGVkdWxlciAqb3BzLCBzdHJ1Y3Qgc2NoZWRfaXRlbSAqaXRlbSkKICAgICAgICAgIHx8IChjcHUg Pj0gbnJfY3B1X2lkcykgKQogICAgICAgICBjcHUgPSB2Yy0+cHJvY2Vzc29yOwogCi0gICAgcmV0 dXJuIGNwdTsKKyAgICByZXR1cm4gcGVyX2NwdShzY2hlZF9yZXMsIGNwdSk7CiB9CiAKIC8qKgpA QCAtNzMwLDcgKzczMCw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3Qgc2NoZWR1bGVyIHNjaGVkX2Fy aW5jNjUzX2RlZiA9IHsKIAogICAgIC5kb19zY2hlZHVsZSAgICA9IGE2NTNzY2hlZF9kb19zY2hl ZHVsZSwKIAotICAgIC5waWNrX2NwdSAgICAgICA9IGE2NTNzY2hlZF9waWNrX2NwdSwKKyAgICAu cGlja19yZXNvdXJjZSAgPSBhNjUzc2NoZWRfcGlja19yZXNvdXJjZSwKIAogICAgIC5zd2l0Y2hf c2NoZWQgICA9IGE2NTNfc3dpdGNoX3NjaGVkLAogCmRpZmYgLS1naXQgYS94ZW4vY29tbW9uL3Nj aGVkX2NyZWRpdC5jIGIveGVuL2NvbW1vbi9zY2hlZF9jcmVkaXQuYwppbmRleCBmYzA2OGExYzVm Li4xNGI3NDlkYzFhIDEwMDY0NAotLS0gYS94ZW4vY29tbW9uL3NjaGVkX2NyZWRpdC5jCisrKyBi L3hlbi9jb21tb24vc2NoZWRfY3JlZGl0LmMKQEAgLTg2Nyw4ICs4NjcsOCBAQCBfY3NjaGVkX2Nw dV9waWNrKGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywgc3RydWN0IHZjcHUgKnZjLCBib29s X3QgY29tbWl0KQogICAgIHJldHVybiBjcHU7CiB9CiAKLXN0YXRpYyBpbnQKLWNzY2hlZF9jcHVf cGljayhjb25zdCBzdHJ1Y3Qgc2NoZWR1bGVyICpvcHMsIHN0cnVjdCBzY2hlZF9pdGVtICppdGVt KQorc3RhdGljIHN0cnVjdCBzY2hlZF9yZXNvdXJjZSAqCitjc2NoZWRfcmVzX3BpY2soY29uc3Qg c3RydWN0IHNjaGVkdWxlciAqb3BzLCBzdHJ1Y3Qgc2NoZWRfaXRlbSAqaXRlbSkKIHsKICAgICBz dHJ1Y3QgdmNwdSAqdmMgPSBpdGVtLT52Y3B1OwogICAgIHN0cnVjdCBjc2NoZWRfdmNwdSAqc3Zj ID0gQ1NDSEVEX1ZDUFUodmMpOwpAQCAtODgxLDcgKzg4MSw3IEBAIGNzY2hlZF9jcHVfcGljayhj b25zdCBzdHJ1Y3Qgc2NoZWR1bGVyICpvcHMsIHN0cnVjdCBzY2hlZF9pdGVtICppdGVtKQogICAg ICAqIGdldCBib29zdGVkLCB3aGljaCB3ZSBkb24ndCBkZXNlcnZlIGFzIHdlIGFyZSAib25seSIg bWlncmF0aW5nLgogICAgICAqLwogICAgIHNldF9iaXQoQ1NDSEVEX0ZMQUdfVkNQVV9NSUdSQVRJ TkcsICZzdmMtPmZsYWdzKTsKLSAgICByZXR1cm4gX2NzY2hlZF9jcHVfcGljayhvcHMsIHZjLCAx KTsKKyAgICByZXR1cm4gcGVyX2NwdShzY2hlZF9yZXMsIF9jc2NoZWRfY3B1X3BpY2sob3BzLCB2 YywgMSkpOwogfQogCiBzdGF0aWMgaW5saW5lIHZvaWQKQEAgLTk4MSw3ICs5ODEsNyBAQCBjc2No ZWRfdmNwdV9hY2N0KHN0cnVjdCBjc2NoZWRfcHJpdmF0ZSAqcHJ2LCB1bnNpZ25lZCBpbnQgY3B1 KQogICAgICAgICAvKgogICAgICAgICAgKiBJZiBpdCdzIGJlZW4gYWN0aXZlIGEgd2hpbGUsIGNo ZWNrIGlmIHdlJ2QgYmUgYmV0dGVyIG9mZgogICAgICAgICAgKiBtaWdyYXRpbmcgaXQgdG8gcnVu IGVsc2V3aGVyZSAoc2VlIG11bHRpLWNvcmUgYW5kIG11bHRpLXRocmVhZAotICAgICAgICAgKiBz dXBwb3J0IGluIGNzY2hlZF9jcHVfcGljaygpKS4KKyAgICAgICAgICogc3VwcG9ydCBpbiBjc2No ZWRfcmVzX3BpY2soKSkuCiAgICAgICAgICAqLwogICAgICAgICBuZXdfY3B1ID0gX2NzY2hlZF9j cHVfcGljayhvcHMsIGN1cnJlbnQsIDApOwogCkBAIC0xMDM2LDExICsxMDM2LDExIEBAIGNzY2hl ZF9pdGVtX2luc2VydChjb25zdCBzdHJ1Y3Qgc2NoZWR1bGVyICpvcHMsIHN0cnVjdCBzY2hlZF9p dGVtICppdGVtKQogCiAgICAgQlVHX09OKCBpc19pZGxlX3ZjcHUodmMpICk7CiAKLSAgICAvKiBj c2NoZWRfY3B1X3BpY2soKSBsb29rcyBpbiB2Yy0+cHJvY2Vzc29yJ3MgcnVucSwgc28gd2UgbmVl ZCB0aGUgbG9jay4gKi8KKyAgICAvKiBjc2NoZWRfcmVzX3BpY2soKSBsb29rcyBpbiB2Yy0+cHJv Y2Vzc29yJ3MgcnVucSwgc28gd2UgbmVlZCB0aGUgbG9jay4gKi8KICAgICBsb2NrID0gdmNwdV9z Y2hlZHVsZV9sb2NrX2lycSh2Yyk7CiAKLSAgICB2Yy0+cHJvY2Vzc29yID0gY3NjaGVkX2NwdV9w aWNrKG9wcywgaXRlbSk7Ci0gICAgaXRlbS0+cmVzID0gcGVyX2NwdShzY2hlZF9yZXMsIHZjLT5w cm9jZXNzb3IpOworICAgIGl0ZW0tPnJlcyA9IGNzY2hlZF9yZXNfcGljayhvcHMsIGl0ZW0pOwor ICAgIHZjLT5wcm9jZXNzb3IgPSBpdGVtLT5yZXMtPnByb2Nlc3NvcjsKIAogICAgIHNwaW5fdW5s b2NrX2lycShsb2NrKTsKIApAQCAtMjI5MCw3ICsyMjkwLDcgQEAgc3RhdGljIGNvbnN0IHN0cnVj dCBzY2hlZHVsZXIgc2NoZWRfY3JlZGl0X2RlZiA9IHsKICAgICAuYWRqdXN0X2FmZmluaXR5PSBj c2NoZWRfYWZmX2NudGwsCiAgICAgLmFkanVzdF9nbG9iYWwgID0gY3NjaGVkX3N5c19jbnRsLAog Ci0gICAgLnBpY2tfY3B1ICAgICAgID0gY3NjaGVkX2NwdV9waWNrLAorICAgIC5waWNrX3Jlc291 cmNlICA9IGNzY2hlZF9yZXNfcGljaywKICAgICAuZG9fc2NoZWR1bGUgICAgPSBjc2NoZWRfc2No ZWR1bGUsCiAKICAgICAuZHVtcF9jcHVfc3RhdGUgPSBjc2NoZWRfZHVtcF9wY3B1LApkaWZmIC0t Z2l0IGEveGVuL2NvbW1vbi9zY2hlZF9jcmVkaXQyLmMgYi94ZW4vY29tbW9uL3NjaGVkX2NyZWRp dDIuYwppbmRleCA2MTRkNzFkOTQ4Li5jOGFlNTg1MjcyIDEwMDY0NAotLS0gYS94ZW4vY29tbW9u L3NjaGVkX2NyZWRpdDIuYworKysgYi94ZW4vY29tbW9uL3NjaGVkX2NyZWRpdDIuYwpAQCAtNjI1 LDkgKzYyNSw5IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBoYXNfY2FwKGNvbnN0IHN0cnVjdCBjc2No ZWQyX3ZjcHUgKnN2YykKICAqIHJ1bnEsIF9hbHdheXNfIGhhcHBlbnMgYnkgbWVhbnMgb2YgdGlj a2xpbmc6CiAgKiAgLSB3aGVuIGEgdmNwdSB3YWtlcyB1cCwgaXQgY2FsbHMgY3NjaGVkMl9pdGVt X3dha2UoKSwgd2hpY2ggY2FsbHMKICAqICAgIHJ1bnFfdGlja2xlKCk7Ci0gKiAgLSB3aGVuIGEg bWlncmF0aW9uIGlzIGluaXRpYXRlZCBpbiBzY2hlZHVsZS5jLCB3ZSBjYWxsIGNzY2hlZDJfY3B1 X3BpY2soKSwKKyAqICAtIHdoZW4gYSBtaWdyYXRpb24gaXMgaW5pdGlhdGVkIGluIHNjaGVkdWxl LmMsIHdlIGNhbGwgY3NjaGVkMl9yZXNfcGljaygpLAogICogICAgY3NjaGVkMl9pdGVtX21pZ3Jh dGUoKSAod2hpY2ggY2FsbHMgbWlncmF0ZSgpKSBhbmQgY3NjaGVkMl9pdGVtX3dha2UoKS4KLSAq ICAgIGNzY2hlZDJfY3B1X3BpY2soKSBsb29rcyBmb3IgdGhlIGxlYXN0IGxvYWRlZCBydW5xIGFu ZCByZXR1cm4ganVzdCBhbnkKKyAqICAgIGNzY2hlZDJfcmVzX3BpY2soKSBsb29rcyBmb3IgdGhl IGxlYXN0IGxvYWRlZCBydW5xIGFuZCByZXR1cm4ganVzdCBhbnkKICAqICAgIG9mIGl0cyBwcm9j ZXNzb3JzLiBUaGVuLCBjc2NoZWQyX2l0ZW1fbWlncmF0ZSgpIGp1c3QgbW92ZXMgdGhlIHZjcHUg dG8KICAqICAgIHRoZSBjaG9zZW4gcnVucSwgYW5kIGl0IGlzIGFnYWluIHJ1bnFfdGlja2xlKCks IGNhbGxlZCBieQogICogICAgY3NjaGVkMl9pdGVtX3dha2UoKSB0aGF0IGFjdHVhbGx5IGRlY2lk ZXMgd2hhdCBwY3B1IHRvIHVzZSB3aXRoaW4gdGhlCkBAIC02NzYsNyArNjc2LDcgQEAgdm9pZCBz bXRfaWRsZV9tYXNrX2NsZWFyKHVuc2lnbmVkIGludCBjcHUsIGNwdW1hc2tfdCAqbWFzaykKIH0K IAogLyoKLSAqIEluIGNzY2hlZDJfY3B1X3BpY2soKSwgaXQgbWF5IG5vdCBiZSBwb3NzaWJsZSB0 byBhY3R1YWxseSBsb29rIGF0IHJlbW90ZQorICogSW4gY3NjaGVkMl9yZXNfcGljaygpLCBpdCBt YXkgbm90IGJlIHBvc3NpYmxlIHRvIGFjdHVhbGx5IGxvb2sgYXQgcmVtb3RlCiAgKiBydW5xdWV1 ZXMgKHRoZSB0cnlsb2NrLXMgb24gdGhlaXIgc3BpbmxvY2tzIGNhbiBmYWlsISkuIElmIHRoYXQg aGFwcGVucywKICAqIHdlIHBpY2ssIGluIG9yZGVyIG9mIGRlY3JlYXNpbmcgcHJlZmVyZW5jZToK ICAqICAxKSBzdmMncyBjdXJyZW50IHBjcHUsIGlmIGl0IGlzIHBhcnQgb2Ygc3ZjJ3Mgc29mdCBh ZmZpbml0eTsKQEAgLTIyMDEsOCArMjIwMSw4IEBAIGNzY2hlZDJfY29udGV4dF9zYXZlZChjb25z dCBzdHJ1Y3Qgc2NoZWR1bGVyICpvcHMsIHN0cnVjdCBzY2hlZF9pdGVtICppdGVtKQogfQogCiAj ZGVmaW5lIE1BWF9MT0FEIChTVElNRV9NQVgpCi1zdGF0aWMgaW50Ci1jc2NoZWQyX2NwdV9waWNr KGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywgc3RydWN0IHNjaGVkX2l0ZW0gKml0ZW0pCitz dGF0aWMgc3RydWN0IHNjaGVkX3Jlc291cmNlICoKK2NzY2hlZDJfcmVzX3BpY2soY29uc3Qgc3Ry dWN0IHNjaGVkdWxlciAqb3BzLCBzdHJ1Y3Qgc2NoZWRfaXRlbSAqaXRlbSkKIHsKICAgICBzdHJ1 Y3QgY3NjaGVkMl9wcml2YXRlICpwcnYgPSBjc2NoZWQyX3ByaXYob3BzKTsKICAgICBzdHJ1Y3Qg dmNwdSAqdmMgPSBpdGVtLT52Y3B1OwpAQCAtMjIxNCw3ICsyMjE0LDcgQEAgY3NjaGVkMl9jcHVf cGljayhjb25zdCBzdHJ1Y3Qgc2NoZWR1bGVyICpvcHMsIHN0cnVjdCBzY2hlZF9pdGVtICppdGVt KQogCiAgICAgQVNTRVJUKCFjcHVtYXNrX2VtcHR5KCZwcnYtPmFjdGl2ZV9xdWV1ZXMpKTsKIAot ICAgIFNDSEVEX1NUQVRfQ1JBTksocGlja19jcHUpOworICAgIFNDSEVEX1NUQVRfQ1JBTksocGlj a19yZXNvdXJjZSk7CiAKICAgICAvKiBMb2NraW5nOgogICAgICAqIC0gUnVucXVldWUgbG9jayBv ZiB2Yy0+cHJvY2Vzc29yIGlzIGFscmVhZHkgbG9ja2VkCkBAIC0yNDIzLDcgKzI0MjMsNyBAQCBj c2NoZWQyX2NwdV9waWNrKGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywgc3RydWN0IHNjaGVk X2l0ZW0gKml0ZW0pCiAgICAgICAgICAgICAgICAgICAgICh1bnNpZ25lZCBjaGFyICopJmQpOwog ICAgIH0KIAotICAgIHJldHVybiBuZXdfY3B1OworICAgIHJldHVybiBwZXJfY3B1KHNjaGVkX3Jl cywgbmV3X2NwdSk7CiB9CiAKIC8qIFdvcmtpbmcgc3RhdGUgb2YgdGhlIGxvYWQtYmFsYW5jaW5n IGFsZ29yaXRobSAqLwpAQCAtMzEyMCwxMSArMzEyMCwxMSBAQCBjc2NoZWQyX2l0ZW1faW5zZXJ0 KGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywgc3RydWN0IHNjaGVkX2l0ZW0gKml0ZW0pCiAg ICAgQVNTRVJUKCFpc19pZGxlX3ZjcHUodmMpKTsKICAgICBBU1NFUlQobGlzdF9lbXB0eSgmc3Zj LT5ydW5xX2VsZW0pKTsKIAotICAgIC8qIGNzY2hlZDJfY3B1X3BpY2soKSBleHBlY3RzIHRoZSBw Y3B1IGxvY2sgdG8gYmUgaGVsZCAqLworICAgIC8qIGNzY2hlZDJfcmVzX3BpY2soKSBleHBlY3Rz IHRoZSBwY3B1IGxvY2sgdG8gYmUgaGVsZCAqLwogICAgIGxvY2sgPSB2Y3B1X3NjaGVkdWxlX2xv Y2tfaXJxKHZjKTsKIAotICAgIHZjLT5wcm9jZXNzb3IgPSBjc2NoZWQyX2NwdV9waWNrKG9wcywg aXRlbSk7Ci0gICAgaXRlbS0+cmVzID0gcGVyX2NwdShzY2hlZF9yZXMsIHZjLT5wcm9jZXNzb3Ip OworICAgIGl0ZW0tPnJlcyA9IGNzY2hlZDJfcmVzX3BpY2sob3BzLCBpdGVtKTsKKyAgICB2Yy0+ cHJvY2Vzc29yID0gaXRlbS0+cmVzLT5wcm9jZXNzb3I7CiAKICAgICBzcGluX3VubG9ja19pcnEo bG9jayk7CiAKQEAgLTQxMTMsNyArNDExMyw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3Qgc2NoZWR1 bGVyIHNjaGVkX2NyZWRpdDJfZGVmID0gewogICAgIC5hZGp1c3RfYWZmaW5pdHk9IGNzY2hlZDJf YWZmX2NudGwsCiAgICAgLmFkanVzdF9nbG9iYWwgID0gY3NjaGVkMl9zeXNfY250bCwKIAotICAg IC5waWNrX2NwdSAgICAgICA9IGNzY2hlZDJfY3B1X3BpY2ssCisgICAgLnBpY2tfcmVzb3VyY2Ug ID0gY3NjaGVkMl9yZXNfcGljaywKICAgICAubWlncmF0ZSAgICAgICAgPSBjc2NoZWQyX2l0ZW1f bWlncmF0ZSwKICAgICAuZG9fc2NoZWR1bGUgICAgPSBjc2NoZWQyX3NjaGVkdWxlLAogICAgIC5j b250ZXh0X3NhdmVkICA9IGNzY2hlZDJfY29udGV4dF9zYXZlZCwKZGlmZiAtLWdpdCBhL3hlbi9j b21tb24vc2NoZWRfbnVsbC5jIGIveGVuL2NvbW1vbi9zY2hlZF9udWxsLmMKaW5kZXggMTE0YjMy ZTJlMS4uYTA4ZjIzOTkzYyAxMDA2NDQKLS0tIGEveGVuL2NvbW1vbi9zY2hlZF9udWxsLmMKKysr IGIveGVuL2NvbW1vbi9zY2hlZF9udWxsLmMKQEAgLTI2OSw5ICsyNjksMTEgQEAgc3RhdGljIHZv aWQgbnVsbF9mcmVlX2RvbWRhdGEoY29uc3Qgc3RydWN0IHNjaGVkdWxlciAqb3BzLCB2b2lkICpk YXRhKQogICoKICAqIFNvIHRoaXMgaXMgbm90IHBhcnQgb2YgYW55IGhvdCBwYXRoLgogICovCi1z dGF0aWMgdW5zaWduZWQgaW50IHBpY2tfY3B1KHN0cnVjdCBudWxsX3ByaXZhdGUgKnBydiwgc3Ry dWN0IHZjcHUgKnYpCitzdGF0aWMgc3RydWN0IHNjaGVkX3Jlc291cmNlICoKK3BpY2tfcmVzKHN0 cnVjdCBudWxsX3ByaXZhdGUgKnBydiwgc3RydWN0IHNjaGVkX2l0ZW0gKml0ZW0pCiB7CiAgICAg dW5zaWduZWQgaW50IGJzOworICAgIHN0cnVjdCB2Y3B1ICp2ID0gaXRlbS0+dmNwdTsKICAgICB1 bnNpZ25lZCBpbnQgY3B1ID0gdi0+cHJvY2Vzc29yLCBuZXdfY3B1OwogICAgIGNwdW1hc2tfdCAq Y3B1cyA9IGNwdXBvb2xfZG9tYWluX2NwdW1hc2sodi0+ZG9tYWluKTsKIApAQCAtMzM1LDcgKzMz Nyw3IEBAIHN0YXRpYyB1bnNpZ25lZCBpbnQgcGlja19jcHUoc3RydWN0IG51bGxfcHJpdmF0ZSAq cHJ2LCBzdHJ1Y3QgdmNwdSAqdikKICAgICAgICAgX190cmFjZV92YXIoVFJDX1NOVUxMX1BJQ0tF RF9DUFUsIDEsIHNpemVvZihkKSwgJmQpOwogICAgIH0KIAotICAgIHJldHVybiBuZXdfY3B1Owor ICAgIHJldHVybiBwZXJfY3B1KHNjaGVkX3JlcywgbmV3X2NwdSk7CiB9CiAKIHN0YXRpYyB2b2lk IHZjcHVfYXNzaWduKHN0cnVjdCBudWxsX3ByaXZhdGUgKnBydiwgc3RydWN0IHZjcHUgKnYsCkBA IC00MjksOCArNDMxLDggQEAgc3RhdGljIHZvaWQgbnVsbF9pdGVtX2luc2VydChjb25zdCBzdHJ1 Y3Qgc2NoZWR1bGVyICpvcHMsCiAgICAgbG9jayA9IHZjcHVfc2NoZWR1bGVfbG9ja19pcnEodik7 CiAgcmV0cnk6CiAKLSAgICBjcHUgPSB2LT5wcm9jZXNzb3IgPSBwaWNrX2NwdShwcnYsIHYpOwot ICAgIGl0ZW0tPnJlcyA9IHBlcl9jcHUoc2NoZWRfcmVzLCBjcHUpOworICAgIGl0ZW0tPnJlcyA9 IHBpY2tfcmVzKHBydiwgaXRlbSk7CisgICAgY3B1ID0gdi0+cHJvY2Vzc29yID0gaXRlbS0+cmVz LT5wcm9jZXNzb3I7CiAKICAgICBzcGluX3VubG9jayhsb2NrKTsKIApAQCAtNTg2LDExICs1ODgs MTEgQEAgc3RhdGljIHZvaWQgbnVsbF9pdGVtX3NsZWVwKGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIg Km9wcywKICAgICBTQ0hFRF9TVEFUX0NSQU5LKHZjcHVfc2xlZXApOwogfQogCi1zdGF0aWMgaW50 IG51bGxfY3B1X3BpY2soY29uc3Qgc3RydWN0IHNjaGVkdWxlciAqb3BzLCBzdHJ1Y3Qgc2NoZWRf aXRlbSAqaXRlbSkKK3N0YXRpYyBzdHJ1Y3Qgc2NoZWRfcmVzb3VyY2UgKgorbnVsbF9yZXNfcGlj ayhjb25zdCBzdHJ1Y3Qgc2NoZWR1bGVyICpvcHMsIHN0cnVjdCBzY2hlZF9pdGVtICppdGVtKQog ewotICAgIHN0cnVjdCB2Y3B1ICp2ID0gaXRlbS0+dmNwdTsKLSAgICBBU1NFUlQoIWlzX2lkbGVf dmNwdSh2KSk7Ci0gICAgcmV0dXJuIHBpY2tfY3B1KG51bGxfcHJpdihvcHMpLCB2KTsKKyAgICBB U1NFUlQoIWlzX2lkbGVfdmNwdShpdGVtLT52Y3B1KSk7CisgICAgcmV0dXJuIHBpY2tfcmVzKG51 bGxfcHJpdihvcHMpLCBpdGVtKTsKIH0KIAogc3RhdGljIHZvaWQgbnVsbF9pdGVtX21pZ3JhdGUo Y29uc3Qgc3RydWN0IHNjaGVkdWxlciAqb3BzLApAQCAtOTA5LDcgKzkxMSw3IEBAIGNvbnN0IHN0 cnVjdCBzY2hlZHVsZXIgc2NoZWRfbnVsbF9kZWYgPSB7CiAKICAgICAud2FrZSAgICAgICAgICAg PSBudWxsX2l0ZW1fd2FrZSwKICAgICAuc2xlZXAgICAgICAgICAgPSBudWxsX2l0ZW1fc2xlZXAs Ci0gICAgLnBpY2tfY3B1ICAgICAgID0gbnVsbF9jcHVfcGljaywKKyAgICAucGlja19yZXNvdXJj ZSAgPSBudWxsX3Jlc19waWNrLAogICAgIC5taWdyYXRlICAgICAgICA9IG51bGxfaXRlbV9taWdy YXRlLAogICAgIC5kb19zY2hlZHVsZSAgICA9IG51bGxfc2NoZWR1bGUsCiAKZGlmZiAtLWdpdCBh L3hlbi9jb21tb24vc2NoZWRfcnQuYyBiL3hlbi9jb21tb24vc2NoZWRfcnQuYwppbmRleCA0NGI4 NmZjMDhkLi4yYmQ0NjM3NTkyIDEwMDY0NAotLS0gYS94ZW4vY29tbW9uL3NjaGVkX3J0LmMKKysr IGIveGVuL2NvbW1vbi9zY2hlZF9ydC5jCkBAIC02MzIsMTIgKzYzMiwxMiBAQCByZXBscV9yZWlu c2VydChjb25zdCBzdHJ1Y3Qgc2NoZWR1bGVyICpvcHMsIHN0cnVjdCBydF92Y3B1ICpzdmMpCiB9 CiAKIC8qCi0gKiBQaWNrIGEgdmFsaWQgQ1BVIGZvciB0aGUgdmNwdSB2YwotICogVmFsaWQgQ1BV IG9mIGEgdmNwdSBpcyBpbnRlc2VjdGlvbiBvZiB2Y3B1J3MgYWZmaW5pdHkKLSAqIGFuZCBhdmFp bGFibGUgY3B1cworICogUGljayBhIHZhbGlkIHJlc291cmNlIGZvciB0aGUgdmNwdSB2YworICog VmFsaWQgcmVzb3VyY2Ugb2YgYSB2Y3B1IGlzIGludGVzZWN0aW9uIG9mIHZjcHUncyBhZmZpbml0 eQorICogYW5kIGF2YWlsYWJsZSByZXNvdXJjZXMKICAqLwotc3RhdGljIGludAotcnRfY3B1X3Bp Y2soY29uc3Qgc3RydWN0IHNjaGVkdWxlciAqb3BzLCBzdHJ1Y3Qgc2NoZWRfaXRlbSAqaXRlbSkK K3N0YXRpYyBzdHJ1Y3Qgc2NoZWRfcmVzb3VyY2UgKgorcnRfcmVzX3BpY2soY29uc3Qgc3RydWN0 IHNjaGVkdWxlciAqb3BzLCBzdHJ1Y3Qgc2NoZWRfaXRlbSAqaXRlbSkKIHsKICAgICBzdHJ1Y3Qg dmNwdSAqdmMgPSBpdGVtLT52Y3B1OwogICAgIGNwdW1hc2tfdCBjcHVzOwpAQCAtNjUyLDcgKzY1 Miw3IEBAIHJ0X2NwdV9waWNrKGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywgc3RydWN0IHNj aGVkX2l0ZW0gKml0ZW0pCiAgICAgICAgICAgICA6IGNwdW1hc2tfY3ljbGUodmMtPnByb2Nlc3Nv ciwgJmNwdXMpOwogICAgIEFTU0VSVCggIWNwdW1hc2tfZW1wdHkoJmNwdXMpICYmIGNwdW1hc2tf dGVzdF9jcHUoY3B1LCAmY3B1cykgKTsKIAotICAgIHJldHVybiBjcHU7CisgICAgcmV0dXJuIHBl cl9jcHUoc2NoZWRfcmVzLCBjcHUpOwogfQogCiAvKgpAQCAtOTAxLDggKzkwMSw4IEBAIHJ0X2l0 ZW1faW5zZXJ0KGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywgc3RydWN0IHNjaGVkX2l0ZW0g Kml0ZW0pCiAgICAgQlVHX09OKCBpc19pZGxlX3ZjcHUodmMpICk7CiAKICAgICAvKiBUaGlzIGlz IHNhZmUgYmVjYXVzZSB2YyBpc24ndCB5ZXQgYmVpbmcgc2NoZWR1bGVkICovCi0gICAgdmMtPnBy b2Nlc3NvciA9IHJ0X2NwdV9waWNrKG9wcywgaXRlbSk7Ci0gICAgaXRlbS0+cmVzID0gcGVyX2Nw dShzY2hlZF9yZXMsIHZjLT5wcm9jZXNzb3IpOworICAgIGl0ZW0tPnJlcyA9IHJ0X3Jlc19waWNr KG9wcywgaXRlbSk7CisgICAgdmMtPnByb2Nlc3NvciA9IGl0ZW0tPnJlcy0+cHJvY2Vzc29yOwog CiAgICAgbG9jayA9IHZjcHVfc2NoZWR1bGVfbG9ja19pcnEodmMpOwogCkBAIC0xNTcxLDcgKzE1 NzEsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IHNjaGVkdWxlciBzY2hlZF9ydGRzX2RlZiA9IHsK IAogICAgIC5hZGp1c3QgICAgICAgICA9IHJ0X2RvbV9jbnRsLAogCi0gICAgLnBpY2tfY3B1ICAg ICAgID0gcnRfY3B1X3BpY2ssCisgICAgLnBpY2tfcmVzb3VyY2UgID0gcnRfcmVzX3BpY2ssCiAg ICAgLmRvX3NjaGVkdWxlICAgID0gcnRfc2NoZWR1bGUsCiAgICAgLnNsZWVwICAgICAgICAgID0g cnRfaXRlbV9zbGVlcCwKICAgICAud2FrZSAgICAgICAgICAgPSBydF9pdGVtX3dha2UsCmRpZmYg LS1naXQgYS94ZW4vY29tbW9uL3NjaGVkdWxlLmMgYi94ZW4vY29tbW9uL3NjaGVkdWxlLmMKaW5k ZXggZTNkOWFiNWEzYS4uODFlZWNhYTY4OSAxMDA2NDQKLS0tIGEveGVuL2NvbW1vbi9zY2hlZHVs ZS5jCisrKyBiL3hlbi9jb21tb24vc2NoZWR1bGUuYwpAQCAtNjg3LDcgKzY4Nyw4IEBAIHN0YXRp YyB2b2lkIHZjcHVfbWlncmF0ZV9maW5pc2goc3RydWN0IHZjcHUgKnYpCiAgICAgICAgICAgICAg ICAgYnJlYWs7CiAKICAgICAgICAgICAgIC8qIFNlbGVjdCBhIG5ldyBDUFUuICovCi0gICAgICAg ICAgICBuZXdfY3B1ID0gc2NoZWRfcGlja19jcHUodmNwdV9zY2hlZHVsZXIodiksIHYtPnNjaGVk X2l0ZW0pOworICAgICAgICAgICAgbmV3X2NwdSA9IHNjaGVkX3BpY2tfcmVzb3VyY2UodmNwdV9z Y2hlZHVsZXIodiksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2 LT5zY2hlZF9pdGVtKS0+cHJvY2Vzc29yOwogICAgICAgICAgICAgaWYgKCAobmV3X2xvY2sgPT0g cGVyX2NwdShzY2hlZHVsZV9kYXRhLCBuZXdfY3B1KS5zY2hlZHVsZV9sb2NrKSAmJgogICAgICAg ICAgICAgICAgICBjcHVtYXNrX3Rlc3RfY3B1KG5ld19jcHUsIHYtPmRvbWFpbi0+Y3B1cG9vbC0+ Y3B1X3ZhbGlkKSApCiAgICAgICAgICAgICAgICAgYnJlYWs7CkBAIC03OTMsOCArNzk0LDkgQEAg dm9pZCByZXN0b3JlX3ZjcHVfYWZmaW5pdHkoc3RydWN0IGRvbWFpbiAqZCkKICAgICAgICAgdi0+ c2NoZWRfaXRlbS0+cmVzID0gcGVyX2NwdShzY2hlZF9yZXMsIHYtPnByb2Nlc3Nvcik7CiAKICAg ICAgICAgbG9jayA9IHZjcHVfc2NoZWR1bGVfbG9ja19pcnEodik7Ci0gICAgICAgIHYtPnByb2Nl c3NvciA9IHNjaGVkX3BpY2tfY3B1KHZjcHVfc2NoZWR1bGVyKHYpLCB2LT5zY2hlZF9pdGVtKTsK LSAgICAgICAgdi0+c2NoZWRfaXRlbS0+cmVzID0gcGVyX2NwdShzY2hlZF9yZXMsIHYtPnByb2Nl c3Nvcik7CisgICAgICAgIHYtPnNjaGVkX2l0ZW0tPnJlcyA9IHNjaGVkX3BpY2tfcmVzb3VyY2Uo dmNwdV9zY2hlZHVsZXIodiksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgdi0+c2NoZWRfaXRlbSk7CisgICAgICAgIHYtPnByb2Nlc3NvciA9IHYtPnNj aGVkX2l0ZW0tPnJlcy0+cHJvY2Vzc29yOwogICAgICAgICBzcGluX3VubG9ja19pcnEobG9jayk7 CiAKICAgICAgICAgaWYgKCBvbGRfY3B1ICE9IHYtPnByb2Nlc3NvciApCmRpZmYgLS1naXQgYS94 ZW4vaW5jbHVkZS94ZW4vcGVyZmNfZGVmbi5oIGIveGVuL2luY2x1ZGUveGVuL3BlcmZjX2RlZm4u aAppbmRleCBlZjZmODZiOTFlLi4xYWQ0Mzg0MDgwIDEwMDY0NAotLS0gYS94ZW4vaW5jbHVkZS94 ZW4vcGVyZmNfZGVmbi5oCisrKyBiL3hlbi9pbmNsdWRlL3hlbi9wZXJmY19kZWZuLmgKQEAgLTY5 LDcgKzY5LDcgQEAgUEVSRkNPVU5URVIobWlncmF0ZV9vbl9ydW5xLCAgICAgICAgImNzY2hlZDI6 IG1pZ3JhdGVfb25fcnVucSIpCiBQRVJGQ09VTlRFUihtaWdyYXRlX25vX3J1bnEsICAgICAgICAi Y3NjaGVkMjogbWlncmF0ZV9ub19ydW5xIikKIFBFUkZDT1VOVEVSKHJ1bnRpbWVfbWluX3RpbWVy LCAgICAgICJjc2NoZWQyOiBydW50aW1lX21pbl90aW1lciIpCiBQRVJGQ09VTlRFUihydW50aW1l X21heF90aW1lciwgICAgICAiY3NjaGVkMjogcnVudGltZV9tYXhfdGltZXIiKQotUEVSRkNPVU5U RVIocGlja19jcHUsICAgICAgICAgICAgICAgImNzY2hlZDI6IHBpY2tfY3B1IikKK1BFUkZDT1VO VEVSKHBpY2tfcmVzb3VyY2UsICAgICAgICAgICJjc2NoZWQyOiBwaWNrX3Jlc291cmNlIikKIFBF UkZDT1VOVEVSKG5lZWRfZmFsbGJhY2tfY3B1LCAgICAgICJjc2NoZWQyOiBuZWVkX2ZhbGxiYWNr X2NwdSIpCiBQRVJGQ09VTlRFUihtaWdyYXRlZCwgICAgICAgICAgICAgICAiY3NjaGVkMjogbWln cmF0ZWQiKQogUEVSRkNPVU5URVIobWlncmF0ZV9yZXNpc3RlZCwgICAgICAgImNzY2hlZDI6IG1p Z3JhdGVfcmVzaXN0ZWQiKQpkaWZmIC0tZ2l0IGEveGVuL2luY2x1ZGUveGVuL3NjaGVkLWlmLmgg Yi94ZW4vaW5jbHVkZS94ZW4vc2NoZWQtaWYuaAppbmRleCAxMDU3MGM5ZjZlLi5jNTdjZjU4ZTAz IDEwMDY0NAotLS0gYS94ZW4vaW5jbHVkZS94ZW4vc2NoZWQtaWYuaAorKysgYi94ZW4vaW5jbHVk ZS94ZW4vc2NoZWQtaWYuaApAQCAtMTc5LDggKzE3OSw4IEBAIHN0cnVjdCBzY2hlZHVsZXIgewog ICAgIHN0cnVjdCB0YXNrX3NsaWNlICgqZG9fc2NoZWR1bGUpIChjb25zdCBzdHJ1Y3Qgc2NoZWR1 bGVyICosIHNfdGltZV90LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBi b29sX3QgdGFza2xldF93b3JrX3NjaGVkdWxlZCk7CiAKLSAgICBpbnQgICAgICAgICAgKCpwaWNr X2NwdSkgICAgICAgKGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKiwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHN0cnVjdCBzY2hlZF9pdGVtICopOworICAgIHN0cnVjdCBzY2hl ZF9yZXNvdXJjZSAqICgqcGlja19yZXNvdXJjZSkgKGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKiwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdHJ1Y3Qgc2No ZWRfaXRlbSAqKTsKICAgICB2b2lkICAgICAgICAgKCptaWdyYXRlKSAgICAgICAgKGNvbnN0IHN0 cnVjdCBzY2hlZHVsZXIgKiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0 cnVjdCBzY2hlZF9pdGVtICosIHVuc2lnbmVkIGludCk7CiAgICAgaW50ICAgICAgICAgICgqYWRq dXN0KSAgICAgICAgIChjb25zdCBzdHJ1Y3Qgc2NoZWR1bGVyICosIHN0cnVjdCBkb21haW4gKiwK QEAgLTM3MywxMSArMzczLDExIEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBzY2hlZF9taWdyYXRlKGNv bnN0IHN0cnVjdCBzY2hlZHVsZXIgKnMsCiAgICAgfQogfQogCi1zdGF0aWMgaW5saW5lIGludCBz Y2hlZF9waWNrX2NwdShjb25zdCBzdHJ1Y3Qgc2NoZWR1bGVyICpzLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgc3RydWN0IHNjaGVkX2l0ZW0gKml0ZW0pCitzdGF0aWMgaW5saW5l IHN0cnVjdCBzY2hlZF9yZXNvdXJjZSAqc2NoZWRfcGlja19yZXNvdXJjZSgKKyAgICBjb25zdCBz dHJ1Y3Qgc2NoZWR1bGVyICpzLCBzdHJ1Y3Qgc2NoZWRfaXRlbSAqaXRlbSkKIHsKLSAgICBBU1NF UlQocy0+cGlja19jcHUpOwotICAgIHJldHVybiBzLT5waWNrX2NwdShzLCBpdGVtKTsKKyAgICBB U1NFUlQocy0+cGlja19yZXNvdXJjZSk7CisgICAgcmV0dXJuIHMtPnBpY2tfcmVzb3VyY2Uocywg aXRlbSk7CiB9CiAKIHN0YXRpYyBpbmxpbmUgdm9pZCBzY2hlZF9hZGp1c3RfYWZmaW5pdHkoY29u c3Qgc3RydWN0IHNjaGVkdWxlciAqcywKLS0gCjIuMTYuNAoKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRl dmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFp bG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=