From: changbin.du@intel.com Subject: [PATCH v5 13/14] drm/i915/gvt: Fix error handling in ppgtt_populate_spt_by_guest_entry Date: Mon, 7 May 2018 15:21:52 +0800 Message-ID: <1525677713-8395-14-git-send-email-changbin.du@intel.com> References: <1525677713-8395-1-git-send-email-changbin.du@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1525677713-8395-1-git-send-email-changbin.du@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-gvt-dev@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQ2hhbmdiaW4gRHUgPGNoYW5nYmluLmR1QGludGVsLmNvbT4KCkRvbid0IGZvcmdldCB0 byBmcmVlIGFsbG9jYXRlZCBzcHQgaWYgc2hhZG93aW5nIGZhaWxlZC4KClNpZ25lZC1vZmYtYnk6 IENoYW5nYmluIER1IDxjaGFuZ2Jpbi5kdUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvZ3Z0L2d0dC5jIHwgMzMgKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgMjEgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvZ3Z0L2d0dC5jCmluZGV4IDJiZjg1YmUuLmY4M2FjMDggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2d2dC9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQvZ3R0 LmMKQEAgLTkwNywxNSArOTA3LDIyIEBAIHN0YXRpYyBzdHJ1Y3QgaW50ZWxfdmdwdV9wcGd0dF9z cHQgKnBwZ3R0X2FsbG9jX3NwdF9nZm4oCiAJICAgICBpICs9IChzcHQtPnNoYWRvd19wYWdlLnBk ZV9pcHMgPyBHVFRfNjRLX1BURV9TVFJJREUgOiAxKSkgXAogCQlpZiAoIXBwZ3R0X2dldF9zaGFk b3dfZW50cnkoc3B0LCBlLCBpKSkKIAotc3RhdGljIHZvaWQgcHBndHRfZ2V0X3NwdChzdHJ1Y3Qg aW50ZWxfdmdwdV9wcGd0dF9zcHQgKnNwdCkKK3N0YXRpYyBpbmxpbmUgdm9pZCBwcGd0dF9nZXRf c3B0KHN0cnVjdCBpbnRlbF92Z3B1X3BwZ3R0X3NwdCAqc3B0KQogewogCWludCB2ID0gYXRvbWlj X3JlYWQoJnNwdC0+cmVmY291bnQpOwogCiAJdHJhY2Vfc3B0X3JlZmNvdW50KHNwdC0+dmdwdS0+ aWQsICJpbmMiLCBzcHQsIHYsICh2ICsgMSkpOwotCiAJYXRvbWljX2luYygmc3B0LT5yZWZjb3Vu dCk7CiB9CiAKK3N0YXRpYyBpbmxpbmUgaW50IHBwZ3R0X3B1dF9zcHQoc3RydWN0IGludGVsX3Zn cHVfcHBndHRfc3B0ICpzcHQpCit7CisJaW50IHYgPSBhdG9taWNfcmVhZCgmc3B0LT5yZWZjb3Vu dCk7CisKKwl0cmFjZV9zcHRfcmVmY291bnQoc3B0LT52Z3B1LT5pZCwgImRlYyIsIHNwdCwgdiwg KHYgLSAxKSk7CisJcmV0dXJuIGF0b21pY19kZWNfcmV0dXJuKCZzcHQtPnJlZmNvdW50KTsKK30K Kwogc3RhdGljIGludCBwcGd0dF9pbnZhbGlkYXRlX3NwdChzdHJ1Y3QgaW50ZWxfdmdwdV9wcGd0 dF9zcHQgKnNwdCk7CiAKIHN0YXRpYyBpbnQgcHBndHRfaW52YWxpZGF0ZV9zcHRfYnlfc2hhZG93 X2VudHJ5KHN0cnVjdCBpbnRlbF92Z3B1ICp2Z3B1LApAQCAtOTY3LDE0ICs5NzQsMTEgQEAgc3Rh dGljIGludCBwcGd0dF9pbnZhbGlkYXRlX3NwdChzdHJ1Y3QgaW50ZWxfdmdwdV9wcGd0dF9zcHQg KnNwdCkKIAlzdHJ1Y3QgaW50ZWxfZ3Z0X2d0dF9lbnRyeSBlOwogCXVuc2lnbmVkIGxvbmcgaW5k ZXg7CiAJaW50IHJldDsKLQlpbnQgdiA9IGF0b21pY19yZWFkKCZzcHQtPnJlZmNvdW50KTsKIAog CXRyYWNlX3NwdF9jaGFuZ2Uoc3B0LT52Z3B1LT5pZCwgImRpZSIsIHNwdCwKIAkJCXNwdC0+Z3Vl c3RfcGFnZS5nZm4sIHNwdC0+c2hhZG93X3BhZ2UudHlwZSk7CiAKLQl0cmFjZV9zcHRfcmVmY291 bnQoc3B0LT52Z3B1LT5pZCwgImRlYyIsIHNwdCwgdiwgKHYgLSAxKSk7Ci0KLQlpZiAoYXRvbWlj X2RlY19yZXR1cm4oJnNwdC0+cmVmY291bnQpID4gMCkKKwlpZiAocHBndHRfcHV0X3NwdChzcHQp ID4gMCkKIAkJcmV0dXJuIDA7CiAKIAlmb3JfZWFjaF9wcmVzZW50X3NoYWRvd19lbnRyeShzcHQs ICZlLCBpbmRleCkgewpAQCAtMTA1Niw4ICsxMDYwLDEwIEBAIHN0YXRpYyBzdHJ1Y3QgaW50ZWxf dmdwdV9wcGd0dF9zcHQgKnBwZ3R0X3BvcHVsYXRlX3NwdF9ieV9ndWVzdF9lbnRyeSgKIAkJCWd2 dF9kYmdfbW0oInJlc2hhZG93IFBERSBzaW5jZSBpcHMgY2hhbmdlZFxuIik7CiAJCQljbGVhcl9w YWdlKHNwdC0+c2hhZG93X3BhZ2UudmFkZHIpOwogCQkJcmV0ID0gcHBndHRfcG9wdWxhdGVfc3B0 KHNwdCk7Ci0JCQlpZiAocmV0KQotCQkJCWdvdG8gZmFpbDsKKwkJCWlmIChyZXQpIHsKKwkJCQlw cGd0dF9wdXRfc3B0KHNwdCk7CisJCQkJZ290byBlcnI7CisJCQl9CiAJCX0KIAl9IGVsc2Ugewog CQlpbnQgdHlwZSA9IGdldF9uZXh0X3B0X3R5cGUod2UtPnR5cGUpOwpAQCAtMTA2NSwyMiArMTA3 MSwyNSBAQCBzdGF0aWMgc3RydWN0IGludGVsX3ZncHVfcHBndHRfc3B0ICpwcGd0dF9wb3B1bGF0 ZV9zcHRfYnlfZ3Vlc3RfZW50cnkoCiAJCXNwdCA9IHBwZ3R0X2FsbG9jX3NwdF9nZm4odmdwdSwg dHlwZSwgb3BzLT5nZXRfcGZuKHdlKSwgaXBzKTsKIAkJaWYgKElTX0VSUihzcHQpKSB7CiAJCQly ZXQgPSBQVFJfRVJSKHNwdCk7Ci0JCQlnb3RvIGZhaWw7CisJCQlnb3RvIGVycjsKIAkJfQogCiAJ CXJldCA9IGludGVsX3ZncHVfZW5hYmxlX3BhZ2VfdHJhY2sodmdwdSwgc3B0LT5ndWVzdF9wYWdl Lmdmbik7CiAJCWlmIChyZXQpCi0JCQlnb3RvIGZhaWw7CisJCQlnb3RvIGVycl9mcmVlX3NwdDsK IAogCQlyZXQgPSBwcGd0dF9wb3B1bGF0ZV9zcHQoc3B0KTsKIAkJaWYgKHJldCkKLQkJCWdvdG8g ZmFpbDsKKwkJCWdvdG8gZXJyX2ZyZWVfc3B0OwogCiAJCXRyYWNlX3NwdF9jaGFuZ2UodmdwdS0+ aWQsICJuZXciLCBzcHQsIHNwdC0+Z3Vlc3RfcGFnZS5nZm4sCiAJCQkJIHNwdC0+c2hhZG93X3Bh Z2UudHlwZSk7CiAJfQogCXJldHVybiBzcHQ7Ci1mYWlsOgorCitlcnJfZnJlZV9zcHQ6CisJcHBn dHRfZnJlZV9zcHQoc3B0KTsKK2VycjoKIAlndnRfdmdwdV9lcnIoImZhaWw6IHNoYWRvdyBwYWdl ICVwIGd1ZXN0IGVudHJ5IDB4JWxseCB0eXBlICVkXG4iLAogCQkgICAgIHNwdCwgd2UtPnZhbDY0 LCB3ZS0+dHlwZSk7CiAJcmV0dXJuIEVSUl9QVFIocmV0KTsKLS0gCjIuNy40CgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK