From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 7/7] drm/amdgpu: move vram usage tracking into the vram manager Date: Mon, 7 Aug 2017 17:48:23 +0200 Message-ID: <1502120903-24080-7-git-send-email-deathsimple@vodafone.de> References: <1502120903-24080-1-git-send-email-deathsimple@vodafone.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1502120903-24080-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKTG9va3Mg bGlrZSBhIGJldHRlciBwbGFjZSBmb3IgdGhpcy4KClNpZ25lZC1vZmYtYnk6IENocmlzdGlhbiBL w7ZuaWcgPGNocmlzdGlhbi5rb2VuaWdAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHUuaCAgICAgICAgICB8ICAyIC0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdV9jcy5jICAgICAgIHwgIDUgKystCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfa21zLmMgICAgICB8ICA5ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L2FtZGdwdV9vYmplY3QuYyAgIHwgNTAgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3R0bS5oICAgICAgfCAgMyArKwogZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZyYW1fbWdyLmMgfCA2NCArKysrKysrKysrKysrKysrKysr KysrKysrKy0tCiA2IGZpbGVzIGNoYW5nZWQsIDcxIGluc2VydGlvbnMoKyksIDYyIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKaW5kZXggYWZmODlkNy4uMDNkNjM0 MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKQEAgLTE0ODQsOCArMTQ4NCw2IEBA IHN0cnVjdCBhbWRncHVfZGV2aWNlIHsKIAlzdHJ1Y3QgYW1kZ3B1X21tYW4JCW1tYW47CiAJc3Ry dWN0IGFtZGdwdV92cmFtX3NjcmF0Y2gJdnJhbV9zY3JhdGNoOwogCXN0cnVjdCBhbWRncHVfd2IJ CXdiOwotCWF0b21pYzY0X3QJCQl2cmFtX3VzYWdlOwotCWF0b21pYzY0X3QJCQl2cmFtX3Zpc191 c2FnZTsKIAlhdG9taWM2NF90CQkJbnVtX2J5dGVzX21vdmVkOwogCWF0b21pYzY0X3QJCQludW1f ZXZpY3Rpb25zOwogCWF0b21pYzY0X3QJCQludW1fdnJhbV9jcHVfcGFnZV9mYXVsdHM7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfY3MuYyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jCmluZGV4IGZlOTc0ZjcuLjY3NDFkZWIgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jCkBAIC0yNDMsNyArMjQzLDcgQEAg c3RhdGljIHZvaWQgYW1kZ3B1X2NzX2dldF90aHJlc2hvbGRfZm9yX21vdmVzKHN0cnVjdCBhbWRn cHVfZGV2aWNlICphZGV2LAogCX0KIAogCXRvdGFsX3ZyYW0gPSBhZGV2LT5tYy5yZWFsX3ZyYW1f c2l6ZSAtIGFkZXYtPnZyYW1fcGluX3NpemU7Ci0JdXNlZF92cmFtID0gYXRvbWljNjRfcmVhZCgm YWRldi0+dnJhbV91c2FnZSk7CisJdXNlZF92cmFtID0gYW1kZ3B1X3ZyYW1fbWdyX3VzYWdlKCZh ZGV2LT5tbWFuLmJkZXYubWFuW1RUTV9QTF9WUkFNXSk7CiAJZnJlZV92cmFtID0gdXNlZF92cmFt ID49IHRvdGFsX3ZyYW0gPyAwIDogdG90YWxfdnJhbSAtIHVzZWRfdnJhbTsKIAogCXNwaW5fbG9j aygmYWRldi0+bW1fc3RhdHMubG9jayk7CkBAIC0yODksNyArMjg5LDggQEAgc3RhdGljIHZvaWQg YW1kZ3B1X2NzX2dldF90aHJlc2hvbGRfZm9yX21vdmVzKHN0cnVjdCBhbWRncHVfZGV2aWNlICph ZGV2LAogCS8qIERvIHRoZSBzYW1lIGZvciB2aXNpYmxlIFZSQU0gaWYgaGFsZiBvZiBpdCBpcyBm cmVlICovCiAJaWYgKGFkZXYtPm1jLnZpc2libGVfdnJhbV9zaXplIDwgYWRldi0+bWMucmVhbF92 cmFtX3NpemUpIHsKIAkJdTY0IHRvdGFsX3Zpc192cmFtID0gYWRldi0+bWMudmlzaWJsZV92cmFt X3NpemU7Ci0JCXU2NCB1c2VkX3Zpc192cmFtID0gYXRvbWljNjRfcmVhZCgmYWRldi0+dnJhbV92 aXNfdXNhZ2UpOworCQl1NjQgdXNlZF92aXNfdnJhbSA9CisJCQlhbWRncHVfdnJhbV9tZ3Jfdmlz X3VzYWdlKCZhZGV2LT5tbWFuLmJkZXYubWFuW1RUTV9QTF9WUkFNXSk7CiAKIAkJaWYgKHVzZWRf dmlzX3ZyYW0gPCB0b3RhbF92aXNfdnJhbSkgewogCQkJdTY0IGZyZWVfdmlzX3ZyYW0gPSB0b3Rh bF92aXNfdnJhbSAtIHVzZWRfdmlzX3ZyYW07CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfa21zLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfa21zLmMKaW5kZXggMzIwOTE5OC4uNGE2NDA3ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ttcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdV9rbXMuYwpAQCAtNDU1LDEwICs0NTUsMTAgQEAgc3RhdGljIGludCBhbWRncHVf aW5mb19pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLCBzdHJ1Y3QgZHJt X2ZpbGUKIAkJdWk2NCA9IGF0b21pYzY0X3JlYWQoJmFkZXYtPm51bV92cmFtX2NwdV9wYWdlX2Zh dWx0cyk7CiAJCXJldHVybiBjb3B5X3RvX3VzZXIob3V0LCAmdWk2NCwgbWluKHNpemUsIDh1KSkg PyAtRUZBVUxUIDogMDsKIAljYXNlIEFNREdQVV9JTkZPX1ZSQU1fVVNBR0U6Ci0JCXVpNjQgPSBh dG9taWM2NF9yZWFkKCZhZGV2LT52cmFtX3VzYWdlKTsKKwkJdWk2NCA9IGFtZGdwdV92cmFtX21n cl91c2FnZSgmYWRldi0+bW1hbi5iZGV2Lm1hbltUVE1fUExfVlJBTV0pOwogCQlyZXR1cm4gY29w eV90b191c2VyKG91dCwgJnVpNjQsIG1pbihzaXplLCA4dSkpID8gLUVGQVVMVCA6IDA7CiAJY2Fz ZSBBTURHUFVfSU5GT19WSVNfVlJBTV9VU0FHRToKLQkJdWk2NCA9IGF0b21pYzY0X3JlYWQoJmFk ZXYtPnZyYW1fdmlzX3VzYWdlKTsKKwkJdWk2NCA9IGFtZGdwdV92cmFtX21ncl92aXNfdXNhZ2Uo JmFkZXYtPm1tYW4uYmRldi5tYW5bVFRNX1BMX1ZSQU1dKTsKIAkJcmV0dXJuIGNvcHlfdG9fdXNl cihvdXQsICZ1aTY0LCBtaW4oc2l6ZSwgOHUpKSA/IC1FRkFVTFQgOiAwOwogCWNhc2UgQU1ER1BV X0lORk9fR1RUX1VTQUdFOgogCQl1aTY0ID0gYW1kZ3B1X2d0dF9tZ3JfdXNhZ2UoJmFkZXYtPm1t YW4uYmRldi5tYW5bVFRNX1BMX1RUXSk7CkBAIC00OTcsNyArNDk3LDggQEAgc3RhdGljIGludCBh bWRncHVfaW5mb19pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLCBzdHJ1 Y3QgZHJtX2ZpbGUKIAkJbWVtLnZyYW0udG90YWxfaGVhcF9zaXplID0gYWRldi0+bWMucmVhbF92 cmFtX3NpemU7CiAJCW1lbS52cmFtLnVzYWJsZV9oZWFwX3NpemUgPQogCQkJYWRldi0+bWMucmVh bF92cmFtX3NpemUgLSBhZGV2LT52cmFtX3Bpbl9zaXplOwotCQltZW0udnJhbS5oZWFwX3VzYWdl ID0gYXRvbWljNjRfcmVhZCgmYWRldi0+dnJhbV91c2FnZSk7CisJCW1lbS52cmFtLmhlYXBfdXNh Z2UgPQorCQkJYW1kZ3B1X3ZyYW1fbWdyX3VzYWdlKCZhZGV2LT5tbWFuLmJkZXYubWFuW1RUTV9Q TF9WUkFNXSk7CiAJCW1lbS52cmFtLm1heF9hbGxvY2F0aW9uID0gbWVtLnZyYW0udXNhYmxlX2hl YXBfc2l6ZSAqIDMgLyA0OwogCiAJCW1lbS5jcHVfYWNjZXNzaWJsZV92cmFtLnRvdGFsX2hlYXBf c2l6ZSA9CkBAIC01MDYsNyArNTA3LDcgQEAgc3RhdGljIGludCBhbWRncHVfaW5mb19pb2N0bChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLCBzdHJ1Y3QgZHJtX2ZpbGUKIAkJCWFk ZXYtPm1jLnZpc2libGVfdnJhbV9zaXplIC0KIAkJCShhZGV2LT52cmFtX3Bpbl9zaXplIC0gYWRl di0+aW52aXNpYmxlX3Bpbl9zaXplKTsKIAkJbWVtLmNwdV9hY2Nlc3NpYmxlX3ZyYW0uaGVhcF91 c2FnZSA9Ci0JCQlhdG9taWM2NF9yZWFkKCZhZGV2LT52cmFtX3Zpc191c2FnZSk7CisJCQlhbWRn cHVfdnJhbV9tZ3JfdmlzX3VzYWdlKCZhZGV2LT5tbWFuLmJkZXYubWFuW1RUTV9QTF9WUkFNXSk7 CiAJCW1lbS5jcHVfYWNjZXNzaWJsZV92cmFtLm1heF9hbGxvY2F0aW9uID0KIAkJCW1lbS5jcHVf YWNjZXNzaWJsZV92cmFtLnVzYWJsZV9oZWFwX3NpemUgKiAzIC8gNDsKIApkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X29iamVjdC5jIGIvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvYW1kZ3B1X29iamVjdC5jCmluZGV4IGQ2N2E5OTcuLjAxYTEyNWIgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9vYmplY3QuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfb2JqZWN0LmMKQEAgLTM3LDUzICsz Nyw2IEBACiAjaW5jbHVkZSAiYW1kZ3B1LmgiCiAjaW5jbHVkZSAiYW1kZ3B1X3RyYWNlLmgiCiAK LQotCi1zdGF0aWMgdTY0IGFtZGdwdV9nZXRfdmlzX3BhcnRfc2l6ZShzdHJ1Y3QgYW1kZ3B1X2Rl dmljZSAqYWRldiwKLQkJCQkJCXN0cnVjdCB0dG1fbWVtX3JlZyAqbWVtKQotewotCWlmIChtZW0t PnN0YXJ0IDw8IFBBR0VfU0hJRlQgPj0gYWRldi0+bWMudmlzaWJsZV92cmFtX3NpemUpCi0JCXJl dHVybiAwOwotCi0JcmV0dXJuICgobWVtLT5zdGFydCA8PCBQQUdFX1NISUZUKSArIG1lbS0+c2l6 ZSkgPgotCQlhZGV2LT5tYy52aXNpYmxlX3ZyYW1fc2l6ZSA/Ci0JCWFkZXYtPm1jLnZpc2libGVf dnJhbV9zaXplIC0gKG1lbS0+c3RhcnQgPDwgUEFHRV9TSElGVCkgOgotCQltZW0tPnNpemU7Ci19 Ci0KLXN0YXRpYyB2b2lkIGFtZGdwdV91cGRhdGVfbWVtb3J5X3VzYWdlKHN0cnVjdCBhbWRncHVf ZGV2aWNlICphZGV2LAotCQkgICAgICAgc3RydWN0IHR0bV9tZW1fcmVnICpvbGRfbWVtLAotCQkg ICAgICAgc3RydWN0IHR0bV9tZW1fcmVnICpuZXdfbWVtKQotewotCXU2NCB2aXNfc2l6ZTsKLQlp ZiAoIWFkZXYpCi0JCXJldHVybjsKLQotCWlmIChuZXdfbWVtKSB7Ci0JCXN3aXRjaCAobmV3X21l bS0+bWVtX3R5cGUpIHsKLQkJY2FzZSBUVE1fUExfVFQ6Ci0JCQlicmVhazsKLQkJY2FzZSBUVE1f UExfVlJBTToKLQkJCWF0b21pYzY0X2FkZChuZXdfbWVtLT5zaXplLCAmYWRldi0+dnJhbV91c2Fn ZSk7Ci0JCQl2aXNfc2l6ZSA9IGFtZGdwdV9nZXRfdmlzX3BhcnRfc2l6ZShhZGV2LCBuZXdfbWVt KTsKLQkJCWF0b21pYzY0X2FkZCh2aXNfc2l6ZSwgJmFkZXYtPnZyYW1fdmlzX3VzYWdlKTsKLQkJ CWJyZWFrOwotCQl9Ci0JfQotCi0JaWYgKG9sZF9tZW0pIHsKLQkJc3dpdGNoIChvbGRfbWVtLT5t ZW1fdHlwZSkgewotCQljYXNlIFRUTV9QTF9UVDoKLQkJCWJyZWFrOwotCQljYXNlIFRUTV9QTF9W UkFNOgotCQkJYXRvbWljNjRfc3ViKG9sZF9tZW0tPnNpemUsICZhZGV2LT52cmFtX3VzYWdlKTsK LQkJCXZpc19zaXplID0gYW1kZ3B1X2dldF92aXNfcGFydF9zaXplKGFkZXYsIG9sZF9tZW0pOwot CQkJYXRvbWljNjRfc3ViKHZpc19zaXplLCAmYWRldi0+dnJhbV92aXNfdXNhZ2UpOwotCQkJYnJl YWs7Ci0JCX0KLQl9Ci19Ci0KIHN0YXRpYyB2b2lkIGFtZGdwdV90dG1fYm9fZGVzdHJveShzdHJ1 Y3QgdHRtX2J1ZmZlcl9vYmplY3QgKnRibykKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl diA9IGFtZGdwdV90dG1fYWRldih0Ym8tPmJkZXYpOwpAQCAtOTIsNyArNDUsNiBAQCBzdGF0aWMg dm9pZCBhbWRncHVfdHRtX2JvX2Rlc3Ryb3koc3RydWN0IHR0bV9idWZmZXJfb2JqZWN0ICp0Ym8p CiAJYm8gPSBjb250YWluZXJfb2YodGJvLCBzdHJ1Y3QgYW1kZ3B1X2JvLCB0Ym8pOwogCiAJYW1k Z3B1X2JvX2t1bm1hcChibyk7Ci0JYW1kZ3B1X3VwZGF0ZV9tZW1vcnlfdXNhZ2UoYWRldiwgJmJv LT50Ym8ubWVtLCBOVUxMKTsKIAogCWRybV9nZW1fb2JqZWN0X3JlbGVhc2UoJmJvLT5nZW1fYmFz ZSk7CiAJYW1kZ3B1X2JvX3VucmVmKCZiby0+cGFyZW50KTsKQEAgLTk5MCw4ICs5NDIsNiBAQCB2 b2lkIGFtZGdwdV9ib19tb3ZlX25vdGlmeShzdHJ1Y3QgdHRtX2J1ZmZlcl9vYmplY3QgKmJvLAog CQlyZXR1cm47CiAKIAkvKiBtb3ZlX25vdGlmeSBpcyBjYWxsZWQgYmVmb3JlIG1vdmUgaGFwcGVu cyAqLwotCWFtZGdwdV91cGRhdGVfbWVtb3J5X3VzYWdlKGFkZXYsICZiby0+bWVtLCBuZXdfbWVt KTsKLQogCXRyYWNlX2FtZGdwdV90dG1fYm9fbW92ZShhYm8sIG5ld19tZW0tPm1lbV90eXBlLCBv bGRfbWVtLT5tZW1fdHlwZSk7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV90dG0uaCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV90 dG0uaAppbmRleCAxMzA3YWI1Li5mMjJhNDc1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfdHRtLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1X3R0bS5oCkBAIC02OCw2ICs2OCw5IEBAIGludCBhbWRncHVfZ3R0X21ncl9hbGxvYyhz dHJ1Y3QgdHRtX21lbV90eXBlX21hbmFnZXIgKm1hbiwKIAkJCSBzdHJ1Y3QgdHRtX21lbV9yZWcg Km1lbSk7CiB1aW50NjRfdCBhbWRncHVfZ3R0X21ncl91c2FnZShzdHJ1Y3QgdHRtX21lbV90eXBl X21hbmFnZXIgKm1hbik7CiAKK3VpbnQ2NF90IGFtZGdwdV92cmFtX21ncl91c2FnZShzdHJ1Y3Qg dHRtX21lbV90eXBlX21hbmFnZXIgKm1hbik7Cit1aW50NjRfdCBhbWRncHVfdnJhbV9tZ3Jfdmlz X3VzYWdlKHN0cnVjdCB0dG1fbWVtX3R5cGVfbWFuYWdlciAqbWFuKTsKKwogaW50IGFtZGdwdV9j b3B5X2J1ZmZlcihzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsIHVpbnQ2NF90IHNyY19vZmZzZXQs CiAJCSAgICAgICB1aW50NjRfdCBkc3Rfb2Zmc2V0LCB1aW50MzJfdCBieXRlX2NvdW50LAogCQkg ICAgICAgc3RydWN0IHJlc2VydmF0aW9uX29iamVjdCAqcmVzdiwKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92cmFtX21nci5jIGIvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1X3ZyYW1fbWdyLmMKaW5kZXggMWViOGQ1ZC4uNDliMGFhMSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZyYW1fbWdyLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZyYW1fbWdyLmMKQEAgLTI4LDYg KzI4LDggQEAKIHN0cnVjdCBhbWRncHVfdnJhbV9tZ3IgewogCXN0cnVjdCBkcm1fbW0gbW07CiAJ c3BpbmxvY2tfdCBsb2NrOworCXVpbnQ2NF90IHVzYWdlOworCXVpbnQ2NF90IHZpc191c2FnZTsK IH07CiAKIC8qKgpAQCAtNzksNiArODEsMjcgQEAgc3RhdGljIGludCBhbWRncHVfdnJhbV9tZ3Jf ZmluaShzdHJ1Y3QgdHRtX21lbV90eXBlX21hbmFnZXIgKm1hbikKIH0KIAogLyoqCisgKiBhbWRn cHVfdnJhbV9tZ3JfdmlzX3NpemUgLSBDYWxjdWxhdGUgdmlzaWJsZSBub2RlIHNpemUKKyAqCisg KiBAYWRldjogYW1kZ3B1IGRldmljZSBzdHJ1Y3R1cmUKKyAqIEBub2RlOiBNTSBub2RlIHN0cnVj dHVyZQorICoKKyAqIENhbGN1bGF0ZSBob3cgbWFueSBieXRlcyBvZiB0aGUgTU0gbm9kZSBhcmUg aW5zaWRlIHZpc2libGUgVlJBTQorICovCitzdGF0aWMgdTY0IGFtZGdwdV92cmFtX21ncl92aXNf c2l6ZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKKwkJCQkgICAgc3RydWN0IGRybV9tbV9u b2RlICpub2RlKQoreworCXVpbnQ2NF90IHN0YXJ0ID0gbm9kZS0+c3RhcnQgPDwgUEFHRV9TSElG VDsKKwl1aW50NjRfdCBlbmQgPSAobm9kZS0+c2l6ZSArIG5vZGUtPnN0YXJ0KSA8PCBQQUdFX1NI SUZUOworCisJaWYgKHN0YXJ0ID49IGFkZXYtPm1jLnZpc2libGVfdnJhbV9zaXplKQorCQlyZXR1 cm4gMDsKKworCXJldHVybiAoZW5kID4gYWRldi0+bWMudmlzaWJsZV92cmFtX3NpemUgPworCQlh ZGV2LT5tYy52aXNpYmxlX3ZyYW1fc2l6ZSA6IGVuZCkgLSBzdGFydDsKK30KKworLyoqCiAgKiBh bWRncHVfdnJhbV9tZ3JfbmV3IC0gYWxsb2NhdGUgbmV3IHJhbmdlcwogICoKICAqIEBtYW46IFRU TSBtZW1vcnkgdHlwZSBtYW5hZ2VyCkBAIC05Myw2ICsxMTYsNyBAQCBzdGF0aWMgaW50IGFtZGdw dV92cmFtX21ncl9uZXcoc3RydWN0IHR0bV9tZW1fdHlwZV9tYW5hZ2VyICptYW4sCiAJCQkgICAg ICAgY29uc3Qgc3RydWN0IHR0bV9wbGFjZSAqcGxhY2UsCiAJCQkgICAgICAgc3RydWN0IHR0bV9t ZW1fcmVnICptZW0pCiB7CisJc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSBhbWRncHVfdHRt X2FkZXYobWFuLT5iZGV2KTsKIAlzdHJ1Y3QgYW1kZ3B1X3ZyYW1fbWdyICptZ3IgPSBtYW4tPnBy aXY7CiAJc3RydWN0IGRybV9tbSAqbW0gPSAmbWdyLT5tbTsKIAlzdHJ1Y3QgZHJtX21tX25vZGUg Km5vZGVzOwpAQCAtMTQyLDYgKzE2Niw5IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X3ZyYW1fbWdyX25l dyhzdHJ1Y3QgdHRtX21lbV90eXBlX21hbmFnZXIgKm1hbiwKIAkJaWYgKHVubGlrZWx5KHIpKQog CQkJZ290byBlcnJvcjsKIAorCQltZ3ItPnVzYWdlICs9IG5vZGVzW2ldLnNpemUgPDwgUEFHRV9T SElGVDsKKwkJbWdyLT52aXNfdXNhZ2UgKz0gYW1kZ3B1X3ZyYW1fbWdyX3Zpc19zaXplKGFkZXYs ICZub2Rlc1tpXSk7CisKIAkJLyogQ2FsY3VsYXRlIGEgdmlydHVhbCBCTyBzdGFydCBhZGRyZXNz IHRvIGVhc2lseSBjaGVjayBpZgogCQkgKiBldmVyeXRoaW5nIGlzIENQVSBhY2Nlc3NpYmxlLgog CQkgKi8KQEAgLTE4MSw2ICsyMDgsNyBAQCBzdGF0aWMgaW50IGFtZGdwdV92cmFtX21ncl9uZXco c3RydWN0IHR0bV9tZW1fdHlwZV9tYW5hZ2VyICptYW4sCiBzdGF0aWMgdm9pZCBhbWRncHVfdnJh bV9tZ3JfZGVsKHN0cnVjdCB0dG1fbWVtX3R5cGVfbWFuYWdlciAqbWFuLAogCQkJCXN0cnVjdCB0 dG1fbWVtX3JlZyAqbWVtKQogeworCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gYW1kZ3B1 X3R0bV9hZGV2KG1hbi0+YmRldik7CiAJc3RydWN0IGFtZGdwdV92cmFtX21nciAqbWdyID0gbWFu LT5wcml2OwogCXN0cnVjdCBkcm1fbW1fbm9kZSAqbm9kZXMgPSBtZW0tPm1tX25vZGU7CiAJdW5z aWduZWQgcGFnZXMgPSBtZW0tPm51bV9wYWdlczsKQEAgLTE5Miw2ICsyMjAsOCBAQCBzdGF0aWMg dm9pZCBhbWRncHVfdnJhbV9tZ3JfZGVsKHN0cnVjdCB0dG1fbWVtX3R5cGVfbWFuYWdlciAqbWFu LAogCXdoaWxlIChwYWdlcykgewogCQlwYWdlcyAtPSBub2Rlcy0+c2l6ZTsKIAkJZHJtX21tX3Jl bW92ZV9ub2RlKG5vZGVzKTsKKwkJbWdyLT51c2FnZSAtPSBub2Rlcy0+c2l6ZSA8PCBQQUdFX1NI SUZUOworCQltZ3ItPnZpc191c2FnZSAtPSBhbWRncHVfdnJhbV9tZ3JfdmlzX3NpemUoYWRldiwg bm9kZXMpOwogCQkrK25vZGVzOwogCX0KIAlzcGluX3VubG9jaygmbWdyLT5sb2NrKTsKQEAgLTIw MSw2ICsyMzEsMzQgQEAgc3RhdGljIHZvaWQgYW1kZ3B1X3ZyYW1fbWdyX2RlbChzdHJ1Y3QgdHRt X21lbV90eXBlX21hbmFnZXIgKm1hbiwKIH0KIAogLyoqCisgKiBhbWRncHVfdnJhbV9tZ3JfdXNh Z2UgLSBob3cgbWFueSBieXRlcyBhcmUgdXNlZCBpbiB0aGlzIGRvbWFpbgorICoKKyAqIEBtYW46 IFRUTSBtZW1vcnkgdHlwZSBtYW5hZ2VyCisgKgorICogUmV0dXJucyBob3cgbWFueSBieXRlcyBh cmUgdXNlZCBpbiB0aGlzIGRvbWFpbi4KKyAqLwordWludDY0X3QgYW1kZ3B1X3ZyYW1fbWdyX3Vz YWdlKHN0cnVjdCB0dG1fbWVtX3R5cGVfbWFuYWdlciAqbWFuKQoreworCXN0cnVjdCBhbWRncHVf dnJhbV9tZ3IgKm1nciA9IG1hbi0+cHJpdjsKKworCXJldHVybiBSRUFEX09OQ0UobWdyLT51c2Fn ZSk7Cit9CisKKy8qKgorICogYW1kZ3B1X3ZyYW1fbWdyX3Zpc191c2FnZSAtIGhvdyBtYW55IGJ5 dGVzIGFyZSB1c2VkIGluIHRoZSB2aXNpYmxlIHBhcnQKKyAqCisgKiBAbWFuOiBUVE0gbWVtb3J5 IHR5cGUgbWFuYWdlcgorICoKKyAqIFJldHVybnMgaG93IG1hbnkgYnl0ZXMgYXJlIHVzZWQgaW4g dGhlIHZpc2libGUgcGFydCBvZiBWUkFNCisgKi8KK3VpbnQ2NF90IGFtZGdwdV92cmFtX21ncl92 aXNfdXNhZ2Uoc3RydWN0IHR0bV9tZW1fdHlwZV9tYW5hZ2VyICptYW4pCit7CisJc3RydWN0IGFt ZGdwdV92cmFtX21nciAqbWdyID0gbWFuLT5wcml2OworCisJcmV0dXJuIFJFQURfT05DRShtZ3It PnZpc191c2FnZSk7Cit9CisKKy8qKgogICogYW1kZ3B1X3ZyYW1fbWdyX2RlYnVnIC0gZHVtcCBW UkFNIHRhYmxlCiAgKgogICogQG1hbjogVFRNIG1lbW9yeSB0eXBlIG1hbmFnZXIKQEAgLTIxMSw3 ICsyNjksNiBAQCBzdGF0aWMgdm9pZCBhbWRncHVfdnJhbV9tZ3JfZGVsKHN0cnVjdCB0dG1fbWVt X3R5cGVfbWFuYWdlciAqbWFuLAogc3RhdGljIHZvaWQgYW1kZ3B1X3ZyYW1fbWdyX2RlYnVnKHN0 cnVjdCB0dG1fbWVtX3R5cGVfbWFuYWdlciAqbWFuLAogCQkJCSAgc3RydWN0IGRybV9wcmludGVy ICpwcmludGVyKQogewotCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gYW1kZ3B1X3R0bV9h ZGV2KG1hbi0+YmRldik7CiAJc3RydWN0IGFtZGdwdV92cmFtX21nciAqbWdyID0gbWFuLT5wcml2 OwogCiAJc3Bpbl9sb2NrKCZtZ3ItPmxvY2spOwpAQCAtMjE5LDkgKzI3Niw4IEBAIHN0YXRpYyB2 b2lkIGFtZGdwdV92cmFtX21ncl9kZWJ1ZyhzdHJ1Y3QgdHRtX21lbV90eXBlX21hbmFnZXIgKm1h biwKIAlzcGluX3VubG9jaygmbWdyLT5sb2NrKTsKIAogCWRybV9wcmludGYocHJpbnRlciwgIm1h biBzaXplOiVsbHUgcGFnZXMsIHJhbSB1c2FnZTolbGx1TUIsIHZpcyB1c2FnZTolbGx1TUJcbiIs Ci0JCSAgIGFkZXYtPm1tYW4uYmRldi5tYW5bVFRNX1BMX1ZSQU1dLnNpemUsCi0JCSAgICh1NjQp YXRvbWljNjRfcmVhZCgmYWRldi0+dnJhbV91c2FnZSkgPj4gMjAsCi0JCSAgICh1NjQpYXRvbWlj NjRfcmVhZCgmYWRldi0+dnJhbV92aXNfdXNhZ2UpID4+IDIwKTsKKwkJICAgbWFuLT5zaXplLCBh bWRncHVfdnJhbV9tZ3JfdXNhZ2UobWFuKSA+PiAyMCwKKwkJICAgYW1kZ3B1X3ZyYW1fbWdyX3Zp c191c2FnZShtYW4pID4+IDIwKTsKIH0KIAogY29uc3Qgc3RydWN0IHR0bV9tZW1fdHlwZV9tYW5h Z2VyX2Z1bmMgYW1kZ3B1X3ZyYW1fbWdyX2Z1bmMgPSB7Ci0tIAoyLjcuNAoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QK YW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==