From: Juergen Gross Subject: [PATCH RFC 21/49] xen/sched: rename scheduler related perf counters Date: Fri, 29 Mar 2019 16:09:06 +0100 Message-ID: <20190329150934.17694-22-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 1h9t8h-0003fs-Gm for xen-devel@lists.xenproject.org; Fri, 29 Mar 2019 15:09:51 +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 , Meng Xu , Jan Beulich List-Id: xen-devel@lists.xenproject.org UmVuYW1lIHRoZSBzY2hlZHVsZXIgcmVsYXRlZCBwZXJmIGNvdW50ZXJzIGZyb20gdmNwdSogdG8g aXRlbSogd2hlcmUKYXBwcm9wcmlhdGUuCgpTaWduZWQtb2ZmLWJ5OiBKdWVyZ2VuIEdyb3NzIDxq Z3Jvc3NAc3VzZS5jb20+Ci0tLQogeGVuL2NvbW1vbi9zY2hlZF9jcmVkaXQuYyAgICB8IDMyICsr KysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tCiB4ZW4vY29tbW9uL3NjaGVkX2NyZWRpdDIu YyAgIHwgMTggKysrKysrKysrLS0tLS0tLS0tCiB4ZW4vY29tbW9uL3NjaGVkX251bGwuYyAgICAg IHwgMTggKysrKysrKysrLS0tLS0tLS0tCiB4ZW4vY29tbW9uL3NjaGVkX3J0LmMgICAgICAgIHwg MTYgKysrKysrKystLS0tLS0tLQogeGVuL2luY2x1ZGUveGVuL3BlcmZjX2RlZm4uaCB8IDMwICsr KysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLQogNSBmaWxlcyBjaGFuZ2VkLCA1NyBpbnNlcnRp b25zKCspLCA1NyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vY29tbW9uL3NjaGVkX2Ny ZWRpdC5jIGIveGVuL2NvbW1vbi9zY2hlZF9jcmVkaXQuYwppbmRleCA4Y2ZlNTRlYzM2Li4zZWEw ZDQwYWZiIDEwMDY0NAotLS0gYS94ZW4vY29tbW9uL3NjaGVkX2NyZWRpdC5jCisrKyBiL3hlbi9j b21tb24vc2NoZWRfY3JlZGl0LmMKQEAgLTY4NCw3ICs2ODQsNyBAQCBfX2NzY2hlZF92Y3B1X2No ZWNrKHN0cnVjdCB2Y3B1ICp2YykKICAgICAgICAgQlVHX09OKCAhaXNfaWRsZV92Y3B1KHZjKSAp OwogICAgIH0KIAotICAgIFNDSEVEX1NUQVRfQ1JBTksodmNwdV9jaGVjayk7CisgICAgU0NIRURf U1RBVF9DUkFOSyhpdGVtX2NoZWNrKTsKIH0KICNkZWZpbmUgQ1NDSEVEX1ZDUFVfQ0hFQ0soX3Zj KSAgKF9fY3NjaGVkX3ZjcHVfY2hlY2soX3ZjKSkKICNlbHNlCkBAIC03MDcsNyArNzA3LDcgQEAg X19jc2NoZWRfdmNwdV9pc19jYWNoZV9ob3QoY29uc3Qgc3RydWN0IGNzY2hlZF9wcml2YXRlICpw cnYsIHN0cnVjdCB2Y3B1ICp2KQogICAgICAgICAgICAgICAgKE5PVygpIC0gdi0+c2NoZWRfaXRl bS0+bGFzdF9ydW5fdGltZSkgPCBwcnYtPnZjcHVfbWlncl9kZWxheTsKIAogICAgIGlmICggaG90 ICkKLSAgICAgICAgU0NIRURfU1RBVF9DUkFOSyh2Y3B1X2hvdCk7CisgICAgICAgIFNDSEVEX1NU QVRfQ1JBTksoaXRlbV9ob3QpOwogCiAgICAgcmV0dXJuIGhvdDsKIH0KQEAgLTg5NSw3ICs4OTUs NyBAQCBfX2NzY2hlZF92Y3B1X2FjY3Rfc3RhcnQoc3RydWN0IGNzY2hlZF9wcml2YXRlICpwcnYs IHN0cnVjdCBjc2NoZWRfaXRlbSAqc3ZjKQogICAgIGlmICggbGlzdF9lbXB0eSgmc3ZjLT5hY3Rp dmVfdmNwdV9lbGVtKSApCiAgICAgewogICAgICAgICBTQ0hFRF9WQ1BVX1NUQVRfQ1JBTksoc3Zj LCBzdGF0ZV9hY3RpdmUpOwotICAgICAgICBTQ0hFRF9TVEFUX0NSQU5LKGFjY3RfdmNwdV9hY3Rp dmUpOworICAgICAgICBTQ0hFRF9TVEFUX0NSQU5LKGFjY3RfaXRlbV9hY3RpdmUpOwogCiAgICAg ICAgIHNkb20tPmFjdGl2ZV92Y3B1X2NvdW50Kys7CiAgICAgICAgIGxpc3RfYWRkKCZzdmMtPmFj dGl2ZV92Y3B1X2VsZW0sICZzZG9tLT5hY3RpdmVfdmNwdSk7CkBAIC05MjIsNyArOTIyLDcgQEAg X19jc2NoZWRfdmNwdV9hY2N0X3N0b3BfbG9ja2VkKHN0cnVjdCBjc2NoZWRfcHJpdmF0ZSAqcHJ2 LAogICAgIEJVR19PTiggbGlzdF9lbXB0eSgmc3ZjLT5hY3RpdmVfdmNwdV9lbGVtKSApOwogCiAg ICAgU0NIRURfVkNQVV9TVEFUX0NSQU5LKHN2Yywgc3RhdGVfaWRsZSk7Ci0gICAgU0NIRURfU1RB VF9DUkFOSyhhY2N0X3ZjcHVfaWRsZSk7CisgICAgU0NIRURfU1RBVF9DUkFOSyhhY2N0X2l0ZW1f aWRsZSk7CiAKICAgICBCVUdfT04oIHBydi0+d2VpZ2h0IDwgc2RvbS0+d2VpZ2h0ICk7CiAgICAg c2RvbS0+YWN0aXZlX3ZjcHVfY291bnQtLTsKQEAgLTEwMjQsNyArMTAyNCw3IEBAIGNzY2hlZF9h bGxvY192ZGF0YShjb25zdCBzdHJ1Y3Qgc2NoZWR1bGVyICpvcHMsIHN0cnVjdCBzY2hlZF9pdGVt ICppdGVtLAogICAgIHN2Yy0+cHJpID0gaXNfaWRsZV9kb21haW4odmMtPmRvbWFpbikgPwogICAg ICAgICBDU0NIRURfUFJJX0lETEUgOiBDU0NIRURfUFJJX1RTX1VOREVSOwogICAgIFNDSEVEX1ZD UFVfU1RBVFNfUkVTRVQoc3ZjKTsKLSAgICBTQ0hFRF9TVEFUX0NSQU5LKHZjcHVfYWxsb2MpOwor ICAgIFNDSEVEX1NUQVRfQ1JBTksoaXRlbV9hbGxvYyk7CiAgICAgcmV0dXJuIHN2YzsKIH0KIApA QCAtMTA1Miw3ICsxMDUyLDcgQEAgY3NjaGVkX2l0ZW1faW5zZXJ0KGNvbnN0IHN0cnVjdCBzY2hl ZHVsZXIgKm9wcywgc3RydWN0IHNjaGVkX2l0ZW0gKml0ZW0pCiAKICAgICBpdGVtX3NjaGVkdWxl X3VubG9ja19pcnEobG9jaywgaXRlbSk7CiAKLSAgICBTQ0hFRF9TVEFUX0NSQU5LKHZjcHVfaW5z ZXJ0KTsKKyAgICBTQ0hFRF9TVEFUX0NSQU5LKGl0ZW1faW5zZXJ0KTsKIH0KIAogc3RhdGljIHZv aWQKQEAgLTEwNzIsMTMgKzEwNzIsMTMgQEAgY3NjaGVkX2l0ZW1fcmVtb3ZlKGNvbnN0IHN0cnVj dCBzY2hlZHVsZXIgKm9wcywgc3RydWN0IHNjaGVkX2l0ZW0gKml0ZW0pCiAgICAgc3RydWN0IGNz Y2hlZF9pdGVtICogY29uc3Qgc3ZjID0gQ1NDSEVEX0lURU0oaXRlbSk7CiAgICAgc3RydWN0IGNz Y2hlZF9kb20gKiBjb25zdCBzZG9tID0gc3ZjLT5zZG9tOwogCi0gICAgU0NIRURfU1RBVF9DUkFO Syh2Y3B1X3JlbW92ZSk7CisgICAgU0NIRURfU1RBVF9DUkFOSyhpdGVtX3JlbW92ZSk7CiAKICAg ICBBU1NFUlQoIV9fdmNwdV9vbl9ydW5xKHN2YykpOwogCiAgICAgaWYgKCB0ZXN0X2FuZF9jbGVh cl9iaXQoQ1NDSEVEX0ZMQUdfVkNQVV9QQVJLRUQsICZzdmMtPmZsYWdzKSApCiAgICAgewotICAg ICAgICBTQ0hFRF9TVEFUX0NSQU5LKHZjcHVfdW5wYXJrKTsKKyAgICAgICAgU0NIRURfU1RBVF9D UkFOSyhpdGVtX3VucGFyayk7CiAgICAgICAgIHZjcHVfdW5wYXVzZShzdmMtPnZjcHUpOwogICAg IH0KIApAQCAtMTA5OSw3ICsxMDk5LDcgQEAgY3NjaGVkX2l0ZW1fc2xlZXAoY29uc3Qgc3RydWN0 IHNjaGVkdWxlciAqb3BzLCBzdHJ1Y3Qgc2NoZWRfaXRlbSAqaXRlbSkKICAgICBzdHJ1Y3QgY3Nj aGVkX2l0ZW0gKiBjb25zdCBzdmMgPSBDU0NIRURfSVRFTShpdGVtKTsKICAgICB1bnNpZ25lZCBp bnQgY3B1ID0gdmMtPnByb2Nlc3NvcjsKIAotICAgIFNDSEVEX1NUQVRfQ1JBTksodmNwdV9zbGVl cCk7CisgICAgU0NIRURfU1RBVF9DUkFOSyhpdGVtX3NsZWVwKTsKIAogICAgIEJVR19PTiggaXNf aWRsZV92Y3B1KHZjKSApOwogCkBAIC0xMTI4LDE5ICsxMTI4LDE5IEBAIGNzY2hlZF9pdGVtX3dh a2UoY29uc3Qgc3RydWN0IHNjaGVkdWxlciAqb3BzLCBzdHJ1Y3Qgc2NoZWRfaXRlbSAqaXRlbSkK IAogICAgIGlmICggdW5saWtlbHkoY3Vycl9vbl9jcHUodmMtPnByb2Nlc3NvcikgPT0gaXRlbSkg KQogICAgIHsKLSAgICAgICAgU0NIRURfU1RBVF9DUkFOSyh2Y3B1X3dha2VfcnVubmluZyk7Cisg ICAgICAgIFNDSEVEX1NUQVRfQ1JBTksoaXRlbV93YWtlX3J1bm5pbmcpOwogICAgICAgICByZXR1 cm47CiAgICAgfQogICAgIGlmICggdW5saWtlbHkoX192Y3B1X29uX3J1bnEoc3ZjKSkgKQogICAg IHsKLSAgICAgICAgU0NIRURfU1RBVF9DUkFOSyh2Y3B1X3dha2Vfb25ydW5xKTsKKyAgICAgICAg U0NIRURfU1RBVF9DUkFOSyhpdGVtX3dha2Vfb25ydW5xKTsKICAgICAgICAgcmV0dXJuOwogICAg IH0KIAogICAgIGlmICggbGlrZWx5KHZjcHVfcnVubmFibGUodmMpKSApCi0gICAgICAgIFNDSEVE X1NUQVRfQ1JBTksodmNwdV93YWtlX3J1bm5hYmxlKTsKKyAgICAgICAgU0NIRURfU1RBVF9DUkFO SyhpdGVtX3dha2VfcnVubmFibGUpOwogICAgIGVsc2UKLSAgICAgICAgU0NIRURfU1RBVF9DUkFO Syh2Y3B1X3dha2Vfbm90X3J1bm5hYmxlKTsKKyAgICAgICAgU0NIRURfU1RBVF9DUkFOSyhpdGVt X3dha2Vfbm90X3J1bm5hYmxlKTsKIAogICAgIC8qCiAgICAgICogV2UgdGVtcG9yYXJseSBib29z dCB0aGUgcHJpb3JpdHkgb2YgYXdha2luZyBWQ1BVcyEKQEAgLTExNzAsNyArMTE3MCw3IEBAIGNz Y2hlZF9pdGVtX3dha2UoY29uc3Qgc3RydWN0IHNjaGVkdWxlciAqb3BzLCBzdHJ1Y3Qgc2NoZWRf aXRlbSAqaXRlbSkKICAgICAgICAgICF0ZXN0X2JpdChDU0NIRURfRkxBR19WQ1BVX1BBUktFRCwg JnN2Yy0+ZmxhZ3MpICkKICAgICB7CiAgICAgICAgIFRSQUNFXzJEKFRSQ19DU0NIRURfQk9PU1Rf U1RBUlQsIHZjLT5kb21haW4tPmRvbWFpbl9pZCwgdmMtPnZjcHVfaWQpOwotICAgICAgICBTQ0hF RF9TVEFUX0NSQU5LKHZjcHVfYm9vc3QpOworICAgICAgICBTQ0hFRF9TVEFUX0NSQU5LKGl0ZW1f Ym9vc3QpOwogICAgICAgICBzdmMtPnByaSA9IENTQ0hFRF9QUklfVFNfQk9PU1Q7CiAgICAgfQog CkBAIC0xNTI5LDcgKzE1MjksNyBAQCBjc2NoZWRfYWNjdCh2b2lkKiBkdW1teSkKICAgICAgICAg ICAgICAgICAgICAgIGNyZWRpdCA8IC1jcmVkaXRfY2FwICYmCiAgICAgICAgICAgICAgICAgICAg ICAhdGVzdF9hbmRfc2V0X2JpdChDU0NIRURfRkxBR19WQ1BVX1BBUktFRCwgJnN2Yy0+ZmxhZ3Mp ICkKICAgICAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgICAgIFNDSEVEX1NUQVRfQ1JB TksodmNwdV9wYXJrKTsKKyAgICAgICAgICAgICAgICAgICAgU0NIRURfU1RBVF9DUkFOSyhpdGVt X3BhcmspOwogICAgICAgICAgICAgICAgICAgICB2Y3B1X3BhdXNlX25vc3luYyhzdmMtPnZjcHUp OwogICAgICAgICAgICAgICAgIH0KIApAQCAtMTU1Myw3ICsxNTUzLDcgQEAgY3NjaGVkX2FjY3Qo dm9pZCogZHVtbXkpCiAgICAgICAgICAgICAgICAgICAgICAqIGNhbGwgdG8gbWFrZSBzdXJlIHRo ZSBWQ1BVJ3MgcHJpb3JpdHkgaXMgbm90IGJvb3N0ZWQKICAgICAgICAgICAgICAgICAgICAgICog aWYgaXQgaXMgd29rZW4gdXAgaGVyZS4KICAgICAgICAgICAgICAgICAgICAgICovCi0gICAgICAg ICAgICAgICAgICAgIFNDSEVEX1NUQVRfQ1JBTksodmNwdV91bnBhcmspOworICAgICAgICAgICAg ICAgICAgICBTQ0hFRF9TVEFUX0NSQU5LKGl0ZW1fdW5wYXJrKTsKICAgICAgICAgICAgICAgICAg ICAgdmNwdV91bnBhdXNlKHN2Yy0+dmNwdSk7CiAgICAgICAgICAgICAgICAgfQogCmRpZmYgLS1n aXQgYS94ZW4vY29tbW9uL3NjaGVkX2NyZWRpdDIuYyBiL3hlbi9jb21tb24vc2NoZWRfY3JlZGl0 Mi5jCmluZGV4IDVjMTc5NGRiNjEuLjhiZWU3Y2I5YTIgMTAwNjQ0Ci0tLSBhL3hlbi9jb21tb24v c2NoZWRfY3JlZGl0Mi5jCisrKyBiL3hlbi9jb21tb24vc2NoZWRfY3JlZGl0Mi5jCkBAIC0yMDE5 LDcgKzIwMTksNyBAQCBjc2NoZWQyX3ZjcHVfY2hlY2soc3RydWN0IHZjcHUgKnZjKQogICAgIHsK ICAgICAgICAgQlVHX09OKCAhaXNfaWRsZV92Y3B1KHZjKSApOwogICAgIH0KLSAgICBTQ0hFRF9T VEFUX0NSQU5LKHZjcHVfY2hlY2spOworICAgIFNDSEVEX1NUQVRfQ1JBTksoaXRlbV9jaGVjayk7 CiB9CiAjZGVmaW5lIENTQ0hFRDJfVkNQVV9DSEVDSyhfdmMpICAoY3NjaGVkMl92Y3B1X2NoZWNr KF92YykpCiAjZWxzZQpAQCAtMjA2Niw3ICsyMDY2LDcgQEAgY3NjaGVkMl9hbGxvY192ZGF0YShj b25zdCBzdHJ1Y3Qgc2NoZWR1bGVyICpvcHMsIHN0cnVjdCBzY2hlZF9pdGVtICppdGVtLAogICAg IHN2Yy0+YnVkZ2V0X3F1b3RhID0gMDsKICAgICBJTklUX0xJU1RfSEVBRCgmc3ZjLT5wYXJrZWRf ZWxlbSk7CiAKLSAgICBTQ0hFRF9TVEFUX0NSQU5LKHZjcHVfYWxsb2MpOworICAgIFNDSEVEX1NU QVRfQ1JBTksoaXRlbV9hbGxvYyk7CiAKICAgICByZXR1cm4gc3ZjOwogfQpAQCAtMjA3OCw3ICsy MDc4LDcgQEAgY3NjaGVkMl9pdGVtX3NsZWVwKGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywg c3RydWN0IHNjaGVkX2l0ZW0gKml0ZW0pCiAgICAgc3RydWN0IGNzY2hlZDJfaXRlbSAqIGNvbnN0 IHN2YyA9IGNzY2hlZDJfaXRlbShpdGVtKTsKIAogICAgIEFTU0VSVCghaXNfaWRsZV92Y3B1KHZj KSk7Ci0gICAgU0NIRURfU1RBVF9DUkFOSyh2Y3B1X3NsZWVwKTsKKyAgICBTQ0hFRF9TVEFUX0NS QU5LKGl0ZW1fc2xlZXApOwogCiAgICAgaWYgKCBjdXJyX29uX2NwdSh2Yy0+cHJvY2Vzc29yKSA9 PSBpdGVtICkKICAgICB7CkBAIC0yMTA4LDIwICsyMTA4LDIwIEBAIGNzY2hlZDJfaXRlbV93YWtl KGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywgc3RydWN0IHNjaGVkX2l0ZW0gKml0ZW0pCiAK ICAgICBpZiAoIHVubGlrZWx5KGN1cnJfb25fY3B1KGNwdSkgPT0gaXRlbSkgKQogICAgIHsKLSAg ICAgICAgU0NIRURfU1RBVF9DUkFOSyh2Y3B1X3dha2VfcnVubmluZyk7CisgICAgICAgIFNDSEVE X1NUQVRfQ1JBTksoaXRlbV93YWtlX3J1bm5pbmcpOwogICAgICAgICBnb3RvIG91dDsKICAgICB9 CiAKICAgICBpZiAoIHVubGlrZWx5KHZjcHVfb25fcnVucShzdmMpKSApCiAgICAgewotICAgICAg ICBTQ0hFRF9TVEFUX0NSQU5LKHZjcHVfd2FrZV9vbnJ1bnEpOworICAgICAgICBTQ0hFRF9TVEFU X0NSQU5LKGl0ZW1fd2FrZV9vbnJ1bnEpOwogICAgICAgICBnb3RvIG91dDsKICAgICB9CiAKICAg ICBpZiAoIGxpa2VseSh2Y3B1X3J1bm5hYmxlKHZjKSkgKQotICAgICAgICBTQ0hFRF9TVEFUX0NS QU5LKHZjcHVfd2FrZV9ydW5uYWJsZSk7CisgICAgICAgIFNDSEVEX1NUQVRfQ1JBTksoaXRlbV93 YWtlX3J1bm5hYmxlKTsKICAgICBlbHNlCi0gICAgICAgIFNDSEVEX1NUQVRfQ1JBTksodmNwdV93 YWtlX25vdF9ydW5uYWJsZSk7CisgICAgICAgIFNDSEVEX1NUQVRfQ1JBTksoaXRlbV93YWtlX25v dF9ydW5uYWJsZSk7CiAKICAgICAvKiBJZiB0aGUgY29udGV4dCBoYXNuJ3QgYmVlbiBzYXZlZCBm b3IgdGhpcyB2Y3B1IHlldCwgd2UgY2FuJ3QgcHV0IGl0IG9uCiAgICAgICogYW5vdGhlciBydW5x dWV1ZS4gIEluc3RlYWQsIHdlIHNldCBhIGZsYWcgc28gdGhhdCBpdCB3aWxsIGJlIHB1dCBvbiB0 aGUgcnVucXVldWUKQEAgLTMxMzcsNyArMzEzNyw3IEBAIGNzY2hlZDJfaXRlbV9pbnNlcnQoY29u c3Qgc3RydWN0IHNjaGVkdWxlciAqb3BzLCBzdHJ1Y3Qgc2NoZWRfaXRlbSAqaXRlbSkKIAogICAg IHNkb20tPm5yX3ZjcHVzKys7CiAKLSAgICBTQ0hFRF9TVEFUX0NSQU5LKHZjcHVfaW5zZXJ0KTsK KyAgICBTQ0hFRF9TVEFUX0NSQU5LKGl0ZW1faW5zZXJ0KTsKIAogICAgIENTQ0hFRDJfVkNQVV9D SEVDSyh2Yyk7CiB9CkBAIC0zMTYwLDcgKzMxNjAsNyBAQCBjc2NoZWQyX2l0ZW1fcmVtb3ZlKGNv bnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywgc3RydWN0IHNjaGVkX2l0ZW0gKml0ZW0pCiAgICAg QVNTRVJUKCFpc19pZGxlX3ZjcHUodmMpKTsKICAgICBBU1NFUlQobGlzdF9lbXB0eSgmc3ZjLT5y dW5xX2VsZW0pKTsKIAotICAgIFNDSEVEX1NUQVRfQ1JBTksodmNwdV9yZW1vdmUpOworICAgIFND SEVEX1NUQVRfQ1JBTksoaXRlbV9yZW1vdmUpOwogCiAgICAgLyogUmVtb3ZlIGZyb20gcnVucXVl dWUgKi8KICAgICBsb2NrID0gaXRlbV9zY2hlZHVsZV9sb2NrX2lycShpdGVtKTsKZGlmZiAtLWdp dCBhL3hlbi9jb21tb24vc2NoZWRfbnVsbC5jIGIveGVuL2NvbW1vbi9zY2hlZF9udWxsLmMKaW5k ZXggYzQ1YWY5ZjhlZS4uNTU3MGNjMWE4YyAxMDA2NDQKLS0tIGEveGVuL2NvbW1vbi9zY2hlZF9u dWxsLmMKKysrIGIveGVuL2NvbW1vbi9zY2hlZF9udWxsLmMKQEAgLTIwNyw3ICsyMDcsNyBAQCBz dGF0aWMgdm9pZCAqbnVsbF9hbGxvY192ZGF0YShjb25zdCBzdHJ1Y3Qgc2NoZWR1bGVyICpvcHMs CiAgICAgSU5JVF9MSVNUX0hFQUQoJm52Yy0+d2FpdHFfZWxlbSk7CiAgICAgbnZjLT52Y3B1ID0g djsKIAotICAgIFNDSEVEX1NUQVRfQ1JBTksodmNwdV9hbGxvYyk7CisgICAgU0NIRURfU1RBVF9D UkFOSyhpdGVtX2FsbG9jKTsKIAogICAgIHJldHVybiBudmM7CiB9CkBAIC00NzMsNyArNDczLDcg QEAgc3RhdGljIHZvaWQgbnVsbF9pdGVtX2luc2VydChjb25zdCBzdHJ1Y3Qgc2NoZWR1bGVyICpv cHMsCiAgICAgfQogICAgIHNwaW5fdW5sb2NrX2lycShsb2NrKTsKIAotICAgIFNDSEVEX1NUQVRf Q1JBTksodmNwdV9pbnNlcnQpOworICAgIFNDSEVEX1NUQVRfQ1JBTksoaXRlbV9pbnNlcnQpOwog fQogCiBzdGF0aWMgdm9pZCBfdmNwdV9yZW1vdmUoc3RydWN0IG51bGxfcHJpdmF0ZSAqcHJ2LCBz dHJ1Y3QgdmNwdSAqdikKQEAgLTU0NCw3ICs1NDQsNyBAQCBzdGF0aWMgdm9pZCBudWxsX2l0ZW1f cmVtb3ZlKGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywKICBvdXQ6CiAgICAgaXRlbV9zY2hl ZHVsZV91bmxvY2tfaXJxKGxvY2ssIGl0ZW0pOwogCi0gICAgU0NIRURfU1RBVF9DUkFOSyh2Y3B1 X3JlbW92ZSk7CisgICAgU0NIRURfU1RBVF9DUkFOSyhpdGVtX3JlbW92ZSk7CiB9CiAKIHN0YXRp YyB2b2lkIG51bGxfaXRlbV93YWtlKGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywKQEAgLTU1 NiwyMSArNTU2LDIxIEBAIHN0YXRpYyB2b2lkIG51bGxfaXRlbV93YWtlKGNvbnN0IHN0cnVjdCBz Y2hlZHVsZXIgKm9wcywKIAogICAgIGlmICggdW5saWtlbHkoY3Vycl9vbl9jcHUodi0+cHJvY2Vz c29yKSA9PSBpdGVtKSApCiAgICAgewotICAgICAgICBTQ0hFRF9TVEFUX0NSQU5LKHZjcHVfd2Fr ZV9ydW5uaW5nKTsKKyAgICAgICAgU0NIRURfU1RBVF9DUkFOSyhpdGVtX3dha2VfcnVubmluZyk7 CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICBpZiAoIHVubGlrZWx5KCFsaXN0X2VtcHR5 KCZudWxsX2l0ZW0oaXRlbSktPndhaXRxX2VsZW0pKSApCiAgICAgewogICAgICAgICAvKiBOb3Qg ZXhhY3RseSAib24gcnVucSIsIGJ1dCBjbG9zZSBlbm91Z2ggZm9yIHJldXNpbmcgdGhlIGNvdW50 ZXIgKi8KLSAgICAgICAgU0NIRURfU1RBVF9DUkFOSyh2Y3B1X3dha2Vfb25ydW5xKTsKKyAgICAg ICAgU0NIRURfU1RBVF9DUkFOSyhpdGVtX3dha2Vfb25ydW5xKTsKICAgICAgICAgcmV0dXJuOwog ICAgIH0KIAogICAgIGlmICggbGlrZWx5KHZjcHVfcnVubmFibGUodikpICkKLSAgICAgICAgU0NI RURfU1RBVF9DUkFOSyh2Y3B1X3dha2VfcnVubmFibGUpOworICAgICAgICBTQ0hFRF9TVEFUX0NS QU5LKGl0ZW1fd2FrZV9ydW5uYWJsZSk7CiAgICAgZWxzZQotICAgICAgICBTQ0hFRF9TVEFUX0NS QU5LKHZjcHVfd2FrZV9ub3RfcnVubmFibGUpOworICAgICAgICBTQ0hFRF9TVEFUX0NSQU5LKGl0 ZW1fd2FrZV9ub3RfcnVubmFibGUpOwogCiAgICAgLyogTm90ZSB0aGF0IHdlIGdldCBoZXJlIG9u bHkgZm9yIHZDUFVzIGFzc2lnbmVkIHRvIGEgcENQVSAqLwogICAgIGNwdV9yYWlzZV9zb2Z0aXJx KHYtPnByb2Nlc3NvciwgU0NIRURVTEVfU09GVElSUSk7CkBAIC01ODcsNyArNTg3LDcgQEAgc3Rh dGljIHZvaWQgbnVsbF9pdGVtX3NsZWVwKGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywKICAg ICBpZiAoIGN1cnJfb25fY3B1KHYtPnByb2Nlc3NvcikgPT0gaXRlbSApCiAgICAgICAgIGNwdV9y YWlzZV9zb2Z0aXJxKHYtPnByb2Nlc3NvciwgU0NIRURVTEVfU09GVElSUSk7CiAKLSAgICBTQ0hF RF9TVEFUX0NSQU5LKHZjcHVfc2xlZXApOworICAgIFNDSEVEX1NUQVRfQ1JBTksoaXRlbV9zbGVl cCk7CiB9CiAKIHN0YXRpYyBzdHJ1Y3Qgc2NoZWRfcmVzb3VyY2UgKgpAQCAtNjk3LDcgKzY5Nyw3 IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBudWxsX3ZjcHVfY2hlY2soc3RydWN0IHZjcHUgKnYpCiAg ICAgZWxzZQogICAgICAgICBCVUdfT04oIWlzX2lkbGVfdmNwdSh2KSk7CiAKLSAgICBTQ0hFRF9T VEFUX0NSQU5LKHZjcHVfY2hlY2spOworICAgIFNDSEVEX1NUQVRfQ1JBTksoaXRlbV9jaGVjayk7 CiB9CiAjZGVmaW5lIE5VTExfVkNQVV9DSEVDSyh2KSAgKG51bGxfdmNwdV9jaGVjayh2KSkKICNl bHNlCmRpZmYgLS1naXQgYS94ZW4vY29tbW9uL3NjaGVkX3J0LmMgYi94ZW4vY29tbW9uL3NjaGVk X3J0LmMKaW5kZXggNTg1NjBkMDg2Yi4uMDYzOWNkY2UwYSAxMDA2NDQKLS0tIGEveGVuL2NvbW1v bi9zY2hlZF9ydC5jCisrKyBiL3hlbi9jb21tb24vc2NoZWRfcnQuYwpAQCAtODcwLDcgKzg3MCw3 IEBAIHJ0X2FsbG9jX3ZkYXRhKGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywgc3RydWN0IHNj aGVkX2l0ZW0gKml0ZW0sIHZvaWQgKmRkKQogICAgIGlmICggIWlzX2lkbGVfdmNwdSh2YykgKQog ICAgICAgICBzdmMtPmJ1ZGdldCA9IFJURFNfREVGQVVMVF9CVURHRVQ7CiAKLSAgICBTQ0hFRF9T VEFUX0NSQU5LKHZjcHVfYWxsb2MpOworICAgIFNDSEVEX1NUQVRfQ1JBTksoaXRlbV9hbGxvYyk7 CiAKICAgICByZXR1cm4gc3ZjOwogfQpAQCAtOTE5LDcgKzkxOSw3IEBAIHJ0X2l0ZW1faW5zZXJ0 KGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywgc3RydWN0IHNjaGVkX2l0ZW0gKml0ZW0pCiAg ICAgfQogICAgIGl0ZW1fc2NoZWR1bGVfdW5sb2NrX2lycShsb2NrLCBpdGVtKTsKIAotICAgIFND SEVEX1NUQVRfQ1JBTksodmNwdV9pbnNlcnQpOworICAgIFNDSEVEX1NUQVRfQ1JBTksoaXRlbV9p bnNlcnQpOwogfQogCiAvKgpAQCAtOTMyLDcgKzkzMiw3IEBAIHJ0X2l0ZW1fcmVtb3ZlKGNvbnN0 IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywgc3RydWN0IHNjaGVkX2l0ZW0gKml0ZW0pCiAgICAgc3Ry dWN0IHJ0X2RvbSAqIGNvbnN0IHNkb20gPSBzdmMtPnNkb207CiAgICAgc3BpbmxvY2tfdCAqbG9j azsKIAotICAgIFNDSEVEX1NUQVRfQ1JBTksodmNwdV9yZW1vdmUpOworICAgIFNDSEVEX1NUQVRf Q1JBTksoaXRlbV9yZW1vdmUpOwogCiAgICAgQlVHX09OKCBzZG9tID09IE5VTEwgKTsKIApAQCAt MTE1NCw3ICsxMTU0LDcgQEAgcnRfaXRlbV9zbGVlcChjb25zdCBzdHJ1Y3Qgc2NoZWR1bGVyICpv cHMsIHN0cnVjdCBzY2hlZF9pdGVtICppdGVtKQogICAgIHN0cnVjdCBydF9pdGVtICogY29uc3Qg c3ZjID0gcnRfaXRlbShpdGVtKTsKIAogICAgIEJVR19PTiggaXNfaWRsZV92Y3B1KHZjKSApOwot ICAgIFNDSEVEX1NUQVRfQ1JBTksodmNwdV9zbGVlcCk7CisgICAgU0NIRURfU1RBVF9DUkFOSyhp dGVtX3NsZWVwKTsKIAogICAgIGlmICggY3Vycl9vbl9jcHUodmMtPnByb2Nlc3NvcikgPT0gaXRl bSApCiAgICAgICAgIGNwdV9yYWlzZV9zb2Z0aXJxKHZjLT5wcm9jZXNzb3IsIFNDSEVEVUxFX1NP RlRJUlEpOwpAQCAtMTI3NSwyMSArMTI3NSwyMSBAQCBydF9pdGVtX3dha2UoY29uc3Qgc3RydWN0 IHNjaGVkdWxlciAqb3BzLCBzdHJ1Y3Qgc2NoZWRfaXRlbSAqaXRlbSkKIAogICAgIGlmICggdW5s aWtlbHkoY3Vycl9vbl9jcHUodmMtPnByb2Nlc3NvcikgPT0gaXRlbSkgKQogICAgIHsKLSAgICAg ICAgU0NIRURfU1RBVF9DUkFOSyh2Y3B1X3dha2VfcnVubmluZyk7CisgICAgICAgIFNDSEVEX1NU QVRfQ1JBTksoaXRlbV93YWtlX3J1bm5pbmcpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCiAg ICAgLyogb24gUnVuUS9EZXBsZXRlZFEsIGp1c3QgdXBkYXRlIGluZm8gaXMgb2sgKi8KICAgICBp ZiAoIHVubGlrZWx5KHZjcHVfb25fcShzdmMpKSApCiAgICAgewotICAgICAgICBTQ0hFRF9TVEFU X0NSQU5LKHZjcHVfd2FrZV9vbnJ1bnEpOworICAgICAgICBTQ0hFRF9TVEFUX0NSQU5LKGl0ZW1f d2FrZV9vbnJ1bnEpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCiAgICAgaWYgKCBsaWtlbHko dmNwdV9ydW5uYWJsZSh2YykpICkKLSAgICAgICAgU0NIRURfU1RBVF9DUkFOSyh2Y3B1X3dha2Vf cnVubmFibGUpOworICAgICAgICBTQ0hFRF9TVEFUX0NSQU5LKGl0ZW1fd2FrZV9ydW5uYWJsZSk7 CiAgICAgZWxzZQotICAgICAgICBTQ0hFRF9TVEFUX0NSQU5LKHZjcHVfd2FrZV9ub3RfcnVubmFi bGUpOworICAgICAgICBTQ0hFRF9TVEFUX0NSQU5LKGl0ZW1fd2FrZV9ub3RfcnVubmFibGUpOwog CiAgICAgLyoKICAgICAgKiBJZiBhIGRlYWRsaW5lIHBhc3NlZCB3aGlsZSBzdmMgd2FzIGFzbGVl cC9ibG9ja2VkLCB3ZSBuZWVkIG5ldwpkaWZmIC0tZ2l0IGEveGVuL2luY2x1ZGUveGVuL3BlcmZj X2RlZm4uaCBiL3hlbi9pbmNsdWRlL3hlbi9wZXJmY19kZWZuLmgKaW5kZXggMWFkNDM4NDA4MC4u MjVhZjRkYmQxMiAxMDA2NDQKLS0tIGEveGVuL2luY2x1ZGUveGVuL3BlcmZjX2RlZm4uaAorKysg Yi94ZW4vaW5jbHVkZS94ZW4vcGVyZmNfZGVmbi5oCkBAIC0yMSwyMCArMjEsMjAgQEAgUEVSRkNP VU5URVIoc2NoZWRfY3R4LCAgICAgICAgICAgICAgInNjaGVkOiBjb250ZXh0IHN3aXRjaGVzIikK IFBFUkZDT1VOVEVSKHNjaGVkdWxlLCAgICAgICAgICAgICAgICJzY2hlZDogc3BlY2lmaWMgc2No ZWR1bGVyIikKIFBFUkZDT1VOVEVSKGRvbV9pbml0LCAgICAgICAgICAgICAgICJzY2hlZDogZG9t X2luaXQiKQogUEVSRkNPVU5URVIoZG9tX2Rlc3Ryb3ksICAgICAgICAgICAgInNjaGVkOiBkb21f ZGVzdHJveSIpCi1QRVJGQ09VTlRFUih2Y3B1X2FsbG9jLCAgICAgICAgICAgICAic2NoZWQ6IHZj cHVfYWxsb2MiKQotUEVSRkNPVU5URVIodmNwdV9pbnNlcnQsICAgICAgICAgICAgInNjaGVkOiB2 Y3B1X2luc2VydCIpCi1QRVJGQ09VTlRFUih2Y3B1X3JlbW92ZSwgICAgICAgICAgICAic2NoZWQ6 IHZjcHVfcmVtb3ZlIikKLVBFUkZDT1VOVEVSKHZjcHVfc2xlZXAsICAgICAgICAgICAgICJzY2hl ZDogdmNwdV9zbGVlcCIpCiBQRVJGQ09VTlRFUih2Y3B1X3lpZWxkLCAgICAgICAgICAgICAic2No ZWQ6IHZjcHVfeWllbGQiKQotUEVSRkNPVU5URVIodmNwdV93YWtlX3J1bm5pbmcsICAgICAgInNj aGVkOiB2Y3B1X3dha2VfcnVubmluZyIpCi1QRVJGQ09VTlRFUih2Y3B1X3dha2Vfb25ydW5xLCAg ICAgICAic2NoZWQ6IHZjcHVfd2FrZV9vbnJ1bnEiKQotUEVSRkNPVU5URVIodmNwdV93YWtlX3J1 bm5hYmxlLCAgICAgInNjaGVkOiB2Y3B1X3dha2VfcnVubmFibGUiKQotUEVSRkNPVU5URVIodmNw dV93YWtlX25vdF9ydW5uYWJsZSwgInNjaGVkOiB2Y3B1X3dha2Vfbm90X3J1bm5hYmxlIikKK1BF UkZDT1VOVEVSKGl0ZW1fYWxsb2MsICAgICAgICAgICAgICJzY2hlZDogaXRlbV9hbGxvYyIpCitQ RVJGQ09VTlRFUihpdGVtX2luc2VydCwgICAgICAgICAgICAic2NoZWQ6IGl0ZW1faW5zZXJ0IikK K1BFUkZDT1VOVEVSKGl0ZW1fcmVtb3ZlLCAgICAgICAgICAgICJzY2hlZDogaXRlbV9yZW1vdmUi KQorUEVSRkNPVU5URVIoaXRlbV9zbGVlcCwgICAgICAgICAgICAgInNjaGVkOiBpdGVtX3NsZWVw IikKK1BFUkZDT1VOVEVSKGl0ZW1fd2FrZV9ydW5uaW5nLCAgICAgICJzY2hlZDogaXRlbV93YWtl X3J1bm5pbmciKQorUEVSRkNPVU5URVIoaXRlbV93YWtlX29ucnVucSwgICAgICAgInNjaGVkOiBp dGVtX3dha2Vfb25ydW5xIikKK1BFUkZDT1VOVEVSKGl0ZW1fd2FrZV9ydW5uYWJsZSwgICAgICJz Y2hlZDogaXRlbV93YWtlX3J1bm5hYmxlIikKK1BFUkZDT1VOVEVSKGl0ZW1fd2FrZV9ub3RfcnVu bmFibGUsICJzY2hlZDogaXRlbV93YWtlX25vdF9ydW5uYWJsZSIpCiBQRVJGQ09VTlRFUih0aWNr bGVkX25vX2NwdSwgICAgICAgICAic2NoZWQ6IHRpY2tsZWRfbm9fY3B1IikKIFBFUkZDT1VOVEVS KHRpY2tsZWRfaWRsZV9jcHUsICAgICAgICJzY2hlZDogdGlja2xlZF9pZGxlX2NwdSIpCiBQRVJG Q09VTlRFUih0aWNrbGVkX2lkbGVfY3B1X2V4Y2wsICAic2NoZWQ6IHRpY2tsZWRfaWRsZV9jcHVf ZXhjbHVzaXZlIikKIFBFUkZDT1VOVEVSKHRpY2tsZWRfYnVzeV9jcHUsICAgICAgICJzY2hlZDog dGlja2xlZF9idXN5X2NwdSIpCi1QRVJGQ09VTlRFUih2Y3B1X2NoZWNrLCAgICAgICAgICAgICAi c2NoZWQ6IHZjcHVfY2hlY2siKQorUEVSRkNPVU5URVIoaXRlbV9jaGVjaywgICAgICAgICAgICAg InNjaGVkOiBpdGVtX2NoZWNrIikKIAogLyogY3JlZGl0IHNwZWNpZmljIGNvdW50ZXJzICovCiBQ RVJGQ09VTlRFUihkZWxheV9tcywgICAgICAgICAgICAgICAiY3NjaGVkOiBkZWxheSIpCkBAIC00 MywxMSArNDMsMTEgQEAgUEVSRkNPVU5URVIoYWNjdF9ub193b3JrLCAgICAgICAgICAgImNzY2hl ZDogYWNjdF9ub193b3JrIikKIFBFUkZDT1VOVEVSKGFjY3RfYmFsYW5jZSwgICAgICAgICAgICJj c2NoZWQ6IGFjY3RfYmFsYW5jZSIpCiBQRVJGQ09VTlRFUihhY2N0X3Jlb3JkZXIsICAgICAgICAg ICAiY3NjaGVkOiBhY2N0X3Jlb3JkZXIiKQogUEVSRkNPVU5URVIoYWNjdF9taW5fY3JlZGl0LCAg ICAgICAgImNzY2hlZDogYWNjdF9taW5fY3JlZGl0IikKLVBFUkZDT1VOVEVSKGFjY3RfdmNwdV9h Y3RpdmUsICAgICAgICJjc2NoZWQ6IGFjY3RfdmNwdV9hY3RpdmUiKQotUEVSRkNPVU5URVIoYWNj dF92Y3B1X2lkbGUsICAgICAgICAgImNzY2hlZDogYWNjdF92Y3B1X2lkbGUiKQotUEVSRkNPVU5U RVIodmNwdV9ib29zdCwgICAgICAgICAgICAgImNzY2hlZDogdmNwdV9ib29zdCIpCi1QRVJGQ09V TlRFUih2Y3B1X3BhcmssICAgICAgICAgICAgICAiY3NjaGVkOiB2Y3B1X3BhcmsiKQotUEVSRkNP VU5URVIodmNwdV91bnBhcmssICAgICAgICAgICAgImNzY2hlZDogdmNwdV91bnBhcmsiKQorUEVS RkNPVU5URVIoYWNjdF9pdGVtX2FjdGl2ZSwgICAgICAgImNzY2hlZDogYWNjdF9pdGVtX2FjdGl2 ZSIpCitQRVJGQ09VTlRFUihhY2N0X2l0ZW1faWRsZSwgICAgICAgICAiY3NjaGVkOiBhY2N0X2l0 ZW1faWRsZSIpCitQRVJGQ09VTlRFUihpdGVtX2Jvb3N0LCAgICAgICAgICAgICAiY3NjaGVkOiBp dGVtX2Jvb3N0IikKK1BFUkZDT1VOVEVSKGl0ZW1fcGFyaywgICAgICAgICAgICAgICJjc2NoZWQ6 IGl0ZW1fcGFyayIpCitQRVJGQ09VTlRFUihpdGVtX3VucGFyaywgICAgICAgICAgICAiY3NjaGVk OiBpdGVtX3VucGFyayIpCiBQRVJGQ09VTlRFUihsb2FkX2JhbGFuY2VfaWRsZSwgICAgICAiY3Nj aGVkOiBsb2FkX2JhbGFuY2VfaWRsZSIpCiBQRVJGQ09VTlRFUihsb2FkX2JhbGFuY2Vfb3Zlciwg ICAgICAiY3NjaGVkOiBsb2FkX2JhbGFuY2Vfb3ZlciIpCiBQRVJGQ09VTlRFUihsb2FkX2JhbGFu Y2Vfb3RoZXIsICAgICAiY3NjaGVkOiBsb2FkX2JhbGFuY2Vfb3RoZXIiKQpAQCAtNTcsNyArNTcs NyBAQCBQRVJGQ09VTlRFUihzdGVhbF9wZWVyX2lkbGUsICAgICAgICAiY3NjaGVkOiBzdGVhbF9w ZWVyX2lkbGUiKQogUEVSRkNPVU5URVIobWlncmF0ZV9xdWV1ZWQsICAgICAgICAgImNzY2hlZDog bWlncmF0ZV9xdWV1ZWQiKQogUEVSRkNPVU5URVIobWlncmF0ZV9ydW5uaW5nLCAgICAgICAgImNz Y2hlZDogbWlncmF0ZV9ydW5uaW5nIikKIFBFUkZDT1VOVEVSKG1pZ3JhdGVfa2lja2VkX2F3YXks ICAgICJjc2NoZWQ6IG1pZ3JhdGVfa2lja2VkX2F3YXkiKQotUEVSRkNPVU5URVIodmNwdV9ob3Qs ICAgICAgICAgICAgICAgImNzY2hlZDogdmNwdV9ob3QiKQorUEVSRkNPVU5URVIoaXRlbV9ob3Qs ICAgICAgICAgICAgICAgImNzY2hlZDogaXRlbV9ob3QiKQogCiAvKiBjcmVkaXQyIHNwZWNpZmlj IGNvdW50ZXJzICovCiBQRVJGQ09VTlRFUihidXJuX2NyZWRpdHNfdDJjLCAgICAgICAiY3NjaGVk MjogYnVybl9jcmVkaXRzX3QyYyIpCi0tIAoyLjE2LjQKCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZl bEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxt YW4vbGlzdGluZm8veGVuLWRldmVs