From: Zhenyu Wang Subject: [PATCH v7 2/2] drm/i915/gvt: Fix guest i915 48bit full ppgtt blocking issue Date: Fri, 7 Jul 2017 15:29:39 +0800 Message-ID: <20170707072939.5842-2-zhenyuw@linux.intel.com> References: <20170707072939.5842-1-zhenyuw@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170707072939.5842-1-zhenyuw@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org, intel-gvt-dev@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVGluYSBaaGFuZyA8dGluYS56aGFuZ0BpbnRlbC5jb20+CgpHdWVzdCBpOTE1IDQ4Yml0 IGZ1bGwgcHBndHQgZnVuY3Rpb25hbGl0eSB3YXMgYmxvY2tpbmcgYnkgYW4gaXNzdWUsIHdoaWNo CndvdWxkIGxlYWQgdG8gZ3B1IGhhcmR3YXJlIGhhbmcuIEd1ZXN0IGk5MTUgZHJpdmVyIG1heSB1 cGRhdGUgdGhlIHBwZ3R0CnRhYmxlIGp1c3QgYmVmb3JlIHRoaXMgd29ya2xvYWQgaXMgZ29pbmcg dG8gYmUgc3VibWl0dGVkIHRvIHRoZSBoYXJkd2FyZQpieSBkZXZpY2UgbW9kZWwuIFRoaXMgY2Fz ZSB3YXNuJ3QgaGFuZGxlZCB3ZWxsIGJ5IGRldmljZSBtb2RlbCBiZWZvcmUsIGR1ZQp0byB0aGUg c21hbGwgdGltZSB3aW5kb3cgYmV0d2VlbiByZW1vdmluZyBvbGQgcHBndHQgZW50cnkgYW5kIGFk ZGluZyB0aGUKbmV3IG9uZS4gRXJyb3JzIG9jY3VyIHdoZW4gdGhlIHdvcmtsb2FkIGlzIGV4ZWN1 dGVkIGJ5IGhhcmR3YXJlIGR1cmluZwp0aGF0IHNtYWxsIHRpbWUgd2luZG93LiBUaGlzIHBhdGNo IGlzIHRvIHJlbW92ZSB0aGlzIHRpbWUgd2luZG93IGJ5IGFkZGluZwp0aGUgbmV3IHBwZ3R0IGVu dHJ5IGZpcnN0IGFuZCB0aGVuIHJlbW92ZSB0aGUgb2xkIG9uZS4KCkNoYW5nZXMgaW4gdjI6Ci0g TW92ZSBWR1RfQ0FQU19GVUxMX1BQR1RUIGludHJvZHVjdGlvbiB0byBwYXRjaCAyLzQuIChKb29u YXMpCgpDaGFuZ2VzIHNpbmNlIHYyOgotIERpdmlkZSB0aGUgd2hvbGUgcGF0Y2ggc2V0IGludG8g dHdvIHNlcGFyYXRlIHBhdGNoIHNlcmllcywgd2l0aCBvbmUKICBwYXRjaCBpbiBpOTE1IHNpZGUg dG8gY2hlY2sgZ3Vlc3QgaTkxNSBmdWxsIHBwZ3R0IGNhcGFiaWxpdHkgYW5kIGVuYWJsZQogIGl0 IHdoZW4gdGhpcyBjYXBhYmlsaXR5IGlzIHN1cHBvcnRlZCBieSB0aGUgZGV2aWNlIG1vZGVsLCBh bmQgdGhlIG90aGVyCiAgb25lIGluIGd2dCBzaWRlIHdoaWNoIGZpeHMgdGhlIGJsb2NraW5nIGlz c3VlIGFuZCBlbmFibGVzIHRoZSBkZXZpY2UKICBtb2RlbCB0byBwcm92aWRlIHRoZSBjYXBhYmls aXR5IHRvIGd1ZXN0LiBBbmQgdGhpcyBwYXRjaCBmb2N1c2VzIG9uIGd2dAogIHNpZGUuIChKb29u YXMpCi0gQ2hhbmdlIHRoZSB0aXRsZSBmcm9tICJyZW9yZGVyIHRoZSBzaGFkb3cgcHBndHQgdXBk YXRlIHByb2Nlc3MgYnkgYWRkaW5nCiAgZW50cnkgZmlyc3QiIHRvICJGaXggZ3Vlc3QgaTkxNSBm dWxsIHBwZ3R0IGJsb2NraW5nIGlzc3VlIi4gKFRpbmEpCgpDaGFuZ2VzIHNpbmNlIHYzOgotIFJl YmFzZSB0byB0aGUgbGF0ZXN0IGJyYW5jaC4KCkNoYW5nZXMgc2luY2UgdjQ6Ci0gVGVzdGVkIGJ5 IFRpbmEgWmhhbmcuCgpDaGFuZ2VzIHNpbmNlIHY1OgotIFJlYmFzZSB0byB0aGUgbGF0ZXN0IGJy YW5jaC4KClNpZ25lZC1vZmYtYnk6IFRpbmEgWmhhbmcgPHRpbmEuemhhbmdAaW50ZWwuY29tPgpT aWduZWQtb2ZmLWJ5OiBaaGVueXUgV2FuZyA8emhlbnl1d0BsaW51eC5pbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2d0dC5jICB8IDQ1ICsrKysrKysrKysrKysrKysrKysr KysrKystLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQvdmdwdS5jIHwg IDEgKwogMiBmaWxlcyBjaGFuZ2VkLCAyOSBpbnNlcnRpb25zKCspLCAxNyBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQvZ3R0LmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9ndnQvZ3R0LmMKaW5kZXggNjE2NmUzNGQ4OTJiLi4yN2JkYTQyNmQ0MmUgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9ndHQuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9ndnQvZ3R0LmMKQEAgLTk3OSwyOSArOTc5LDI2IEBAIHN0YXRpYyBpbnQgcHBn dHRfcG9wdWxhdGVfc2hhZG93X3BhZ2Uoc3RydWN0IGludGVsX3ZncHVfcHBndHRfc3B0ICpzcHQp CiB9CiAKIHN0YXRpYyBpbnQgcHBndHRfaGFuZGxlX2d1ZXN0X2VudHJ5X3JlbW92YWwoc3RydWN0 IGludGVsX3ZncHVfZ3Vlc3RfcGFnZSAqZ3B0LAotCQl1bnNpZ25lZCBsb25nIGluZGV4KQorCQlz dHJ1Y3QgaW50ZWxfZ3Z0X2d0dF9lbnRyeSAqc2UsIHVuc2lnbmVkIGxvbmcgaW5kZXgpCiB7CiAJ c3RydWN0IGludGVsX3ZncHVfcHBndHRfc3B0ICpzcHQgPSBndWVzdF9wYWdlX3RvX3BwZ3R0X3Nw dChncHQpOwogCXN0cnVjdCBpbnRlbF92Z3B1X3NoYWRvd19wYWdlICpzcCA9ICZzcHQtPnNoYWRv d19wYWdlOwogCXN0cnVjdCBpbnRlbF92Z3B1ICp2Z3B1ID0gc3B0LT52Z3B1OwogCXN0cnVjdCBp bnRlbF9ndnRfZ3R0X3B0ZV9vcHMgKm9wcyA9IHZncHUtPmd2dC0+Z3R0LnB0ZV9vcHM7Ci0Jc3Ry dWN0IGludGVsX2d2dF9ndHRfZW50cnkgZTsKIAlpbnQgcmV0OwogCi0JcHBndHRfZ2V0X3NoYWRv d19lbnRyeShzcHQsICZlLCBpbmRleCk7Ci0KLQl0cmFjZV9ncHRfY2hhbmdlKHNwdC0+dmdwdS0+ aWQsICJyZW1vdmUiLCBzcHQsIHNwLT50eXBlLCBlLnZhbDY0LAorCXRyYWNlX2dwdF9jaGFuZ2Uo c3B0LT52Z3B1LT5pZCwgInJlbW92ZSIsIHNwdCwgc3AtPnR5cGUsIHNlLT52YWw2NCwKIAkJCSBp bmRleCk7CiAKLQlpZiAoIW9wcy0+dGVzdF9wcmVzZW50KCZlKSkKKwlpZiAoIW9wcy0+dGVzdF9w cmVzZW50KHNlKSkKIAkJcmV0dXJuIDA7CiAKLQlpZiAob3BzLT5nZXRfcGZuKCZlKSA9PSB2Z3B1 LT5ndHQuc2NyYXRjaF9wdFtzcC0+dHlwZV0ucGFnZV9tZm4pCisJaWYgKG9wcy0+Z2V0X3Bmbihz ZSkgPT0gdmdwdS0+Z3R0LnNjcmF0Y2hfcHRbc3AtPnR5cGVdLnBhZ2VfbWZuKQogCQlyZXR1cm4g MDsKIAotCWlmIChndHRfdHlwZV9pc19wdChnZXRfbmV4dF9wdF90eXBlKGUudHlwZSkpKSB7CisJ aWYgKGd0dF90eXBlX2lzX3B0KGdldF9uZXh0X3B0X3R5cGUoc2UtPnR5cGUpKSkgewogCQlzdHJ1 Y3QgaW50ZWxfdmdwdV9wcGd0dF9zcHQgKnMgPQotCQkJcHBndHRfZmluZF9zaGFkb3dfcGFnZSh2 Z3B1LCBvcHMtPmdldF9wZm4oJmUpKTsKKwkJCXBwZ3R0X2ZpbmRfc2hhZG93X3BhZ2UodmdwdSwg b3BzLT5nZXRfcGZuKHNlKSk7CiAJCWlmICghcykgewogCQkJZ3Z0X3ZncHVfZXJyKCJmYWlsIHRv IGZpbmQgZ3Vlc3QgcGFnZVxuIik7CiAJCQlyZXQgPSAtRU5YSU87CkBAIC0xMDExLDEyICsxMDA4 LDEwIEBAIHN0YXRpYyBpbnQgcHBndHRfaGFuZGxlX2d1ZXN0X2VudHJ5X3JlbW92YWwoc3RydWN0 IGludGVsX3ZncHVfZ3Vlc3RfcGFnZSAqZ3B0LAogCQlpZiAocmV0KQogCQkJZ290byBmYWlsOwog CX0KLQlvcHMtPnNldF9wZm4oJmUsIHZncHUtPmd0dC5zY3JhdGNoX3B0W3NwLT50eXBlXS5wYWdl X21mbik7Ci0JcHBndHRfc2V0X3NoYWRvd19lbnRyeShzcHQsICZlLCBpbmRleCk7CiAJcmV0dXJu IDA7CiBmYWlsOgogCWd2dF92Z3B1X2VycigiZmFpbDogc2hhZG93IHBhZ2UgJXAgZ3Vlc3QgZW50 cnkgMHglbGx4IHR5cGUgJWRcbiIsCi0JCQlzcHQsIGUudmFsNjQsIGUudHlwZSk7CisJCQlzcHQs IHNlLT52YWw2NCwgc2UtPnR5cGUpOwogCXJldHVybiByZXQ7CiB9CiAKQEAgLTEyMzYsMjIgKzEy MzEsMzcgQEAgc3RhdGljIGludCBwcGd0dF9oYW5kbGVfZ3Vlc3Rfd3JpdGVfcGFnZV90YWJsZSgK IHsKIAlzdHJ1Y3QgaW50ZWxfdmdwdV9wcGd0dF9zcHQgKnNwdCA9IGd1ZXN0X3BhZ2VfdG9fcHBn dHRfc3B0KGdwdCk7CiAJc3RydWN0IGludGVsX3ZncHUgKnZncHUgPSBzcHQtPnZncHU7CisJaW50 IHR5cGUgPSBzcHQtPnNoYWRvd19wYWdlLnR5cGU7CiAJc3RydWN0IGludGVsX2d2dF9ndHRfcHRl X29wcyAqb3BzID0gdmdwdS0+Z3Z0LT5ndHQucHRlX29wczsKKwlzdHJ1Y3QgaW50ZWxfZ3Z0X2d0 dF9lbnRyeSBzZTsKIAogCWludCByZXQ7CiAJaW50IG5ld19wcmVzZW50OwogCiAJbmV3X3ByZXNl bnQgPSBvcHMtPnRlc3RfcHJlc2VudCh3ZSk7CiAKLQlyZXQgPSBwcGd0dF9oYW5kbGVfZ3Vlc3Rf ZW50cnlfcmVtb3ZhbChncHQsIGluZGV4KTsKLQlpZiAocmV0KQotCQlnb3RvIGZhaWw7CisJLyoK KwkgKiBBZGRpbmcgdGhlIG5ldyBlbnRyeSBmaXJzdCBhbmQgdGhlbiByZW1vdmluZyB0aGUgb2xk IG9uZSwgdGhhdCBjYW4KKwkgKiBndWFyYW50ZWUgdGhlIHBwZ3R0IHRhYmxlIGlzIHZhbGlkYXRl ZCBkdXJpbmcgdGhlIHdpbmRvdyBiZXR3ZWVuCisJICogYWRkaW5nIGFuZCByZW1vdmFsLgorCSAq LworCXBwZ3R0X2dldF9zaGFkb3dfZW50cnkoc3B0LCAmc2UsIGluZGV4KTsKIAogCWlmIChuZXdf cHJlc2VudCkgewogCQlyZXQgPSBwcGd0dF9oYW5kbGVfZ3Vlc3RfZW50cnlfYWRkKGdwdCwgd2Us IGluZGV4KTsKIAkJaWYgKHJldCkKIAkJCWdvdG8gZmFpbDsKIAl9CisKKwlyZXQgPSBwcGd0dF9o YW5kbGVfZ3Vlc3RfZW50cnlfcmVtb3ZhbChncHQsICZzZSwgaW5kZXgpOworCWlmIChyZXQpCisJ CWdvdG8gZmFpbDsKKworCWlmICghbmV3X3ByZXNlbnQpIHsKKwkJb3BzLT5zZXRfcGZuKCZzZSwg dmdwdS0+Z3R0LnNjcmF0Y2hfcHRbdHlwZV0ucGFnZV9tZm4pOworCQlwcGd0dF9zZXRfc2hhZG93 X2VudHJ5KHNwdCwgJnNlLCBpbmRleCk7CisJfQorCiAJcmV0dXJuIDA7CiBmYWlsOgogCWd2dF92 Z3B1X2VycigiZmFpbDogc2hhZG93IHBhZ2UgJXAgZ3Vlc3QgZW50cnkgMHglbGx4IHR5cGUgJWQu XG4iLApAQCAtMTMyMyw3ICsxMzMzLDcgQEAgc3RhdGljIGludCBwcGd0dF9oYW5kbGVfZ3Vlc3Rf d3JpdGVfcGFnZV90YWJsZV9ieXRlcyh2b2lkICpncCwKIAlzdHJ1Y3QgaW50ZWxfdmdwdSAqdmdw dSA9IHNwdC0+dmdwdTsKIAlzdHJ1Y3QgaW50ZWxfZ3Z0X2d0dF9wdGVfb3BzICpvcHMgPSB2Z3B1 LT5ndnQtPmd0dC5wdGVfb3BzOwogCWNvbnN0IHN0cnVjdCBpbnRlbF9ndnRfZGV2aWNlX2luZm8g KmluZm8gPSAmdmdwdS0+Z3Z0LT5kZXZpY2VfaW5mbzsKLQlzdHJ1Y3QgaW50ZWxfZ3Z0X2d0dF9l bnRyeSB3ZTsKKwlzdHJ1Y3QgaW50ZWxfZ3Z0X2d0dF9lbnRyeSB3ZSwgc2U7CiAJdW5zaWduZWQg bG9uZyBpbmRleDsKIAlpbnQgcmV0OwogCkBAIC0xMzM5LDcgKzEzNDksOCBAQCBzdGF0aWMgaW50 IHBwZ3R0X2hhbmRsZV9ndWVzdF93cml0ZV9wYWdlX3RhYmxlX2J5dGVzKHZvaWQgKmdwLAogCQkJ cmV0dXJuIHJldDsKIAl9IGVsc2UgewogCQlpZiAoIXRlc3RfYml0KGluZGV4LCBzcHQtPnBvc3Rf c2hhZG93X2JpdG1hcCkpIHsKLQkJCXJldCA9IHBwZ3R0X2hhbmRsZV9ndWVzdF9lbnRyeV9yZW1v dmFsKGdwdCwgaW5kZXgpOworCQkJcHBndHRfZ2V0X3NoYWRvd19lbnRyeShzcHQsICZzZSwgaW5k ZXgpOworCQkJcmV0ID0gcHBndHRfaGFuZGxlX2d1ZXN0X2VudHJ5X3JlbW92YWwoZ3B0LCAmc2Us IGluZGV4KTsKIAkJCWlmIChyZXQpCiAJCQkJcmV0dXJuIHJldDsKIAkJfQpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L3ZncHUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2 dC92Z3B1LmMKaW5kZXggOTBjMTRlNmUzZWEwLi43M2Y0N2MxMmJiOWYgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2d2dC92Z3B1LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv Z3Z0L3ZncHUuYwpAQCAtNDMsNiArNDMsNyBAQCB2b2lkIHBvcHVsYXRlX3B2aW5mb19wYWdlKHN0 cnVjdCBpbnRlbF92Z3B1ICp2Z3B1KQogCXZncHVfdnJlZyh2Z3B1LCB2Z3RpZl9yZWcodmVyc2lv bl9taW5vcikpID0gMDsKIAl2Z3B1X3ZyZWcodmdwdSwgdmd0aWZfcmVnKGRpc3BsYXlfcmVhZHkp KSA9IDA7CiAJdmdwdV92cmVnKHZncHUsIHZndGlmX3JlZyh2Z3RfaWQpKSA9IHZncHUtPmlkOwor CXZncHVfdnJlZyh2Z3B1LCB2Z3RpZl9yZWcodmd0X2NhcHMpKSA9IFZHVF9DQVBTX0ZVTExfUFBH VFRfNDhCSVQ7CiAJdmdwdV92cmVnKHZncHUsIHZndGlmX3JlZyhhdmFpbF9ycy5tYXBwYWJsZV9n bWFkci5iYXNlKSkgPQogCQl2Z3B1X2FwZXJ0dXJlX2dtYWRyX2Jhc2UodmdwdSk7CiAJdmdwdV92 cmVnKHZncHUsIHZndGlmX3JlZyhhdmFpbF9ycy5tYXBwYWJsZV9nbWFkci5zaXplKSkgPQotLSAK Mi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK