From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Nicolai=20H=C3=A4hnle?= Subject: [PATCH v2 04/11] locking/ww_mutex: Set use_ww_ctx even when locking without a context Date: Thu, 1 Dec 2016 15:06:47 +0100 Message-ID: <1480601214-26583-5-git-send-email-nhaehnle@gmail.com> References: <1480601214-26583-1-git-send-email-nhaehnle@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9747D6E7D9 for ; Thu, 1 Dec 2016 14:07:06 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id g23so34457399wme.1 for ; Thu, 01 Dec 2016 06:07:06 -0800 (PST) In-Reply-To: <1480601214-26583-1-git-send-email-nhaehnle@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org Cc: Maarten Lankhorst , =?UTF-8?q?Nicolai=20H=C3=A4hnle?= , Peter Zijlstra , dri-devel@lists.freedesktop.org, Ingo Molnar List-Id: dri-devel@lists.freedesktop.org RnJvbTogTmljb2xhaSBIw6RobmxlIDxOaWNvbGFpLkhhZWhubGVAYW1kLmNvbT4KCldlIHdpbGwg YWRkIGEgbmV3IGZpZWxkIHRvIHN0cnVjdCBtdXRleF93YWl0ZXIuICBUaGlzIGZpZWxkIG11c3Qg YmUKaW5pdGlhbGl6ZWQgZm9yIGFsbCB3YWl0ZXJzIGlmIGFueSB3YWl0ZXIgdXNlcyB0aGUgd3df dXNlX2N0eCBwYXRoLgoKU28gdGhlcmUgaXMgYSB0cmFkZS1vZmY6IEtlZXAgd3dfbXV0ZXggbG9j a2luZyB3aXRob3V0IGEgY29udGV4dCBvbiB0aGUKZmFzdGVyIG5vbi11c2Vfd3dfY3R4IHBhdGgs IGF0IHRoZSBjb3N0IG9mIGFkZGluZyB0aGUgaW5pdGlhbGl6YXRpb24gdG8gYWxsCm11dGV4IGxv Y2tzIChpbmNsdWRpbmcgbm9uLXd3X211dGV4ZXMpLCBvciBhdm9pZCB0aGUgYWRkaXRpb25hbCBj b3N0IGZvcgpub24td3dfbXV0ZXggbG9ja3MsIGF0IHRoZSBjb3N0IG9mIGFkZGluZyBhZGRpdGlv bmFsIGNoZWNrcyB0byB0aGUKdXNlX3d3X2N0eCBwYXRoLgoKV2UgdGFrZSB0aGUgbGF0dGVyIGNo b2ljZS4gIEl0IG1heSBiZSB3b3J0aCBlbGltaW5hdGluZyB0aGUgdXNlcnMgb2YKd3dfbXV0ZXhf bG9jayhsb2NrLCBOVUxMKSwgYnV0IHRoZXJlIGFyZSBhIGxvdCBvZiB0aGVtLgoKTW92ZSB0aGUg ZGVjbGFyYXRpb24gb2Ygd3cgaW4gX19tdXRleF9sb2NrX2NvbW1vbiBjbG9zZXIgdG8gaXRzIHVz ZXMKYmVjYXVzZSBnY2Mgb3RoZXJ3aXNlIChpbmNvcnJlY3RseSkgYmVsaWV2ZXMgd3cgbWF5IGJl IHVzZWQgd2l0aG91dAppbml0aWFsaXphdGlvbi4KCkNjOiBQZXRlciBaaWpsc3RyYSA8cGV0ZXJ6 QGluZnJhZGVhZC5vcmc+CkNjOiBJbmdvIE1vbG5hciA8bWluZ29AcmVkaGF0LmNvbT4KQ2M6IE1h YXJ0ZW4gTGFua2hvcnN0IDxkZXZAbWJsYW5raG9yc3Qubmw+CkNjOiBEYW5pZWwgVmV0dGVyIDxk YW5pZWxAZmZ3bGwuY2g+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51 az4KQ2M6IGRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKU2lnbmVkLW9mZi1ieTogTmlj b2xhaSBIw6RobmxlIDxOaWNvbGFpLkhhZWhubGVAYW1kLmNvbT4KLS0tCiBpbmNsdWRlL2xpbnV4 L3d3X211dGV4LmggfCAxMSArKy0tLS0tLS0tLQoga2VybmVsL2xvY2tpbmcvbXV0ZXguYyAgIHwg MzcgKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2Vk LCAyNyBpbnNlcnRpb25zKCspLCAyMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9pbmNsdWRl L2xpbnV4L3d3X211dGV4LmggYi9pbmNsdWRlL2xpbnV4L3d3X211dGV4LmgKaW5kZXggMmJiNWRl Yi4uYTU5NjBlNSAxMDA2NDQKLS0tIGEvaW5jbHVkZS9saW51eC93d19tdXRleC5oCisrKyBiL2lu Y2x1ZGUvbGludXgvd3dfbXV0ZXguaApAQCAtMjIyLDExICsyMjIsNyBAQCBleHRlcm4gaW50IF9f bXVzdF9jaGVjayBfX3d3X211dGV4X2xvY2tfaW50ZXJydXB0aWJsZShzdHJ1Y3Qgd3dfbXV0ZXgg KmxvY2ssCiAgKi8KIHN0YXRpYyBpbmxpbmUgaW50IHd3X211dGV4X2xvY2soc3RydWN0IHd3X211 dGV4ICpsb2NrLCBzdHJ1Y3Qgd3dfYWNxdWlyZV9jdHggKmN0eCkKIHsKLQlpZiAoY3R4KQotCQly ZXR1cm4gX193d19tdXRleF9sb2NrKGxvY2ssIGN0eCk7Ci0KLQltdXRleF9sb2NrKCZsb2NrLT5i YXNlKTsKLQlyZXR1cm4gMDsKKwlyZXR1cm4gX193d19tdXRleF9sb2NrKGxvY2ssIGN0eCk7CiB9 CiAKIC8qKgpAQCAtMjYyLDEwICsyNTgsNyBAQCBzdGF0aWMgaW5saW5lIGludCB3d19tdXRleF9s b2NrKHN0cnVjdCB3d19tdXRleCAqbG9jaywgc3RydWN0IHd3X2FjcXVpcmVfY3R4ICpjdAogc3Rh dGljIGlubGluZSBpbnQgX19tdXN0X2NoZWNrIHd3X211dGV4X2xvY2tfaW50ZXJydXB0aWJsZShz dHJ1Y3Qgd3dfbXV0ZXggKmxvY2ssCiAJCQkJCQkJICAgc3RydWN0IHd3X2FjcXVpcmVfY3R4ICpj dHgpCiB7Ci0JaWYgKGN0eCkKLQkJcmV0dXJuIF9fd3dfbXV0ZXhfbG9ja19pbnRlcnJ1cHRpYmxl KGxvY2ssIGN0eCk7Ci0JZWxzZQotCQlyZXR1cm4gbXV0ZXhfbG9ja19pbnRlcnJ1cHRpYmxlKCZs b2NrLT5iYXNlKTsKKwlyZXR1cm4gX193d19tdXRleF9sb2NrX2ludGVycnVwdGlibGUobG9jaywg Y3R4KTsKIH0KIAogLyoqCmRpZmYgLS1naXQgYS9rZXJuZWwvbG9ja2luZy9tdXRleC5jIGIva2Vy bmVsL2xvY2tpbmcvbXV0ZXguYwppbmRleCAyMDA2MjlhLi41ODU2MjdmIDEwMDY0NAotLS0gYS9r ZXJuZWwvbG9ja2luZy9tdXRleC5jCisrKyBiL2tlcm5lbC9sb2NraW5nL211dGV4LmMKQEAgLTM4 MSw3ICszODEsNyBAQCBib29sIG11dGV4X3NwaW5fb25fb3duZXIoc3RydWN0IG11dGV4ICpsb2Nr LCBzdHJ1Y3QgdGFza19zdHJ1Y3QgKm93bmVyLAogCQkJYnJlYWs7CiAJCX0KIAotCQlpZiAodXNl X3d3X2N0eCAmJiB3d19jdHgtPmFjcXVpcmVkID4gMCkgeworCQlpZiAodXNlX3d3X2N0eCAmJiB3 d19jdHggJiYgd3dfY3R4LT5hY3F1aXJlZCA+IDApIHsKIAkJCXN0cnVjdCB3d19tdXRleCAqd3c7 CiAKIAkJCXd3ID0gY29udGFpbmVyX29mKGxvY2ssIHN0cnVjdCB3d19tdXRleCwgYmFzZSk7CkBA IC02NDAsMTAgKzY0MCwxMSBAQCBfX211dGV4X2xvY2tfY29tbW9uKHN0cnVjdCBtdXRleCAqbG9j aywgbG9uZyBzdGF0ZSwgdW5zaWduZWQgaW50IHN1YmNsYXNzLAogCXN0cnVjdCBtdXRleF93YWl0 ZXIgd2FpdGVyOwogCXVuc2lnbmVkIGxvbmcgZmxhZ3M7CiAJYm9vbCBmaXJzdCA9IGZhbHNlOwot CXN0cnVjdCB3d19tdXRleCAqd3c7CiAJaW50IHJldDsKIAotCWlmICh1c2Vfd3dfY3R4KSB7CisJ aWYgKHVzZV93d19jdHggJiYgd3dfY3R4KSB7CisJCXN0cnVjdCB3d19tdXRleCAqd3c7CisKIAkJ d3cgPSBjb250YWluZXJfb2YobG9jaywgc3RydWN0IHd3X211dGV4LCBiYXNlKTsKIAkJaWYgKHVu bGlrZWx5KHd3X2N0eCA9PSBSRUFEX09OQ0Uod3ctPmN0eCkpKQogCQkJcmV0dXJuIC1FQUxSRUFE WTsKQEAgLTY1Niw4ICs2NTcsMTIgQEAgX19tdXRleF9sb2NrX2NvbW1vbihzdHJ1Y3QgbXV0ZXgg KmxvY2ssIGxvbmcgc3RhdGUsIHVuc2lnbmVkIGludCBzdWJjbGFzcywKIAkgICAgbXV0ZXhfb3B0 aW1pc3RpY19zcGluKGxvY2ssIHd3X2N0eCwgdXNlX3d3X2N0eCwgZmFsc2UpKSB7CiAJCS8qIGdv dCB0aGUgbG9jaywgeWF5ISAqLwogCQlsb2NrX2FjcXVpcmVkKCZsb2NrLT5kZXBfbWFwLCBpcCk7 Ci0JCWlmICh1c2Vfd3dfY3R4KQorCQlpZiAodXNlX3d3X2N0eCAmJiB3d19jdHgpIHsKKwkJCXN0 cnVjdCB3d19tdXRleCAqd3c7CisKKwkJCXd3ID0gY29udGFpbmVyX29mKGxvY2ssIHN0cnVjdCB3 d19tdXRleCwgYmFzZSk7CiAJCQl3d19tdXRleF9zZXRfY29udGV4dF9mYXN0cGF0aCh3dywgd3df Y3R4KTsKKwkJfQogCQlwcmVlbXB0X2VuYWJsZSgpOwogCQlyZXR1cm4gMDsKIAl9CkBAIC03MDIs NyArNzA3LDcgQEAgX19tdXRleF9sb2NrX2NvbW1vbihzdHJ1Y3QgbXV0ZXggKmxvY2ssIGxvbmcg c3RhdGUsIHVuc2lnbmVkIGludCBzdWJjbGFzcywKIAkJCWdvdG8gZXJyOwogCQl9CiAKLQkJaWYg KHVzZV93d19jdHggJiYgd3dfY3R4LT5hY3F1aXJlZCA+IDApIHsKKwkJaWYgKHVzZV93d19jdHgg JiYgd3dfY3R4ICYmIHd3X2N0eC0+YWNxdWlyZWQgPiAwKSB7CiAJCQlyZXQgPSBfX3d3X211dGV4 X2xvY2tfY2hlY2tfc3RhbXAobG9jaywgd3dfY3R4KTsKIAkJCWlmIChyZXQpCiAJCQkJZ290byBl cnI7CkBAIC03NDIsOCArNzQ3LDEyIEBAIF9fbXV0ZXhfbG9ja19jb21tb24oc3RydWN0IG11dGV4 ICpsb2NrLCBsb25nIHN0YXRlLCB1bnNpZ25lZCBpbnQgc3ViY2xhc3MsCiAJLyogZ290IHRoZSBs b2NrIC0gY2xlYW51cCBhbmQgcmVqb2ljZSEgKi8KIAlsb2NrX2FjcXVpcmVkKCZsb2NrLT5kZXBf bWFwLCBpcCk7CiAKLQlpZiAodXNlX3d3X2N0eCkKKwlpZiAodXNlX3d3X2N0eCAmJiB3d19jdHgp IHsKKwkJc3RydWN0IHd3X211dGV4ICp3dzsKKworCQl3dyA9IGNvbnRhaW5lcl9vZihsb2NrLCBz dHJ1Y3Qgd3dfbXV0ZXgsIGJhc2UpOwogCQl3d19tdXRleF9zZXRfY29udGV4dF9zbG93cGF0aCh3 dywgd3dfY3R4KTsKKwl9CiAKIAlzcGluX3VubG9ja19tdXRleCgmbG9jay0+d2FpdF9sb2NrLCBm bGFncyk7CiAJcHJlZW1wdF9lbmFibGUoKTsKQEAgLTgzMCw4ICs4MzksOSBAQCBfX3d3X211dGV4 X2xvY2soc3RydWN0IHd3X211dGV4ICpsb2NrLCBzdHJ1Y3Qgd3dfYWNxdWlyZV9jdHggKmN0eCkK IAogCW1pZ2h0X3NsZWVwKCk7CiAJcmV0ID0gIF9fbXV0ZXhfbG9ja19jb21tb24oJmxvY2stPmJh c2UsIFRBU0tfVU5JTlRFUlJVUFRJQkxFLAotCQkJCSAgIDAsICZjdHgtPmRlcF9tYXAsIF9SRVRf SVBfLCBjdHgsIDEpOwotCWlmICghcmV0ICYmIGN0eC0+YWNxdWlyZWQgPiAxKQorCQkJCSAgIDAs IGN0eCA/ICZjdHgtPmRlcF9tYXAgOiBOVUxMLCBfUkVUX0lQXywKKwkJCQkgICBjdHgsIDEpOwor CWlmICghcmV0ICYmIGN0eCAmJiBjdHgtPmFjcXVpcmVkID4gMSkKIAkJcmV0dXJuIHd3X211dGV4 X2RlYWRsb2NrX2luamVjdGlvbihsb2NrLCBjdHgpOwogCiAJcmV0dXJuIHJldDsKQEAgLTg0NSw5 ICs4NTUsMTAgQEAgX193d19tdXRleF9sb2NrX2ludGVycnVwdGlibGUoc3RydWN0IHd3X211dGV4 ICpsb2NrLCBzdHJ1Y3Qgd3dfYWNxdWlyZV9jdHggKmN0eCkKIAogCW1pZ2h0X3NsZWVwKCk7CiAJ cmV0ID0gX19tdXRleF9sb2NrX2NvbW1vbigmbG9jay0+YmFzZSwgVEFTS19JTlRFUlJVUFRJQkxF LAotCQkJCSAgMCwgJmN0eC0+ZGVwX21hcCwgX1JFVF9JUF8sIGN0eCwgMSk7CisJCQkJICAwLCBj dHggPyAmY3R4LT5kZXBfbWFwIDogTlVMTCwgX1JFVF9JUF8sCisJCQkJICBjdHgsIDEpOwogCi0J aWYgKCFyZXQgJiYgY3R4LT5hY3F1aXJlZCA+IDEpCisJaWYgKCFyZXQgJiYgY3R4ICYmIGN0eC0+ YWNxdWlyZWQgPiAxKQogCQlyZXR1cm4gd3dfbXV0ZXhfZGVhZGxvY2tfaW5qZWN0aW9uKGxvY2ss IGN0eCk7CiAKIAlyZXR1cm4gcmV0OwpAQCAtMTAzNCw3ICsxMDQ1LDggQEAgX193d19tdXRleF9s b2NrKHN0cnVjdCB3d19tdXRleCAqbG9jaywgc3RydWN0IHd3X2FjcXVpcmVfY3R4ICpjdHgpCiAJ bWlnaHRfc2xlZXAoKTsKIAogCWlmIChfX211dGV4X3RyeWxvY2tfZmFzdCgmbG9jay0+YmFzZSkp IHsKLQkJd3dfbXV0ZXhfc2V0X2NvbnRleHRfZmFzdHBhdGgobG9jaywgY3R4KTsKKwkJaWYgKGN0 eCkKKwkJCXd3X211dGV4X3NldF9jb250ZXh0X2Zhc3RwYXRoKGxvY2ssIGN0eCk7CiAJCXJldHVy biAwOwogCX0KIApAQCAtMTA0OCw3ICsxMDYwLDggQEAgX193d19tdXRleF9sb2NrX2ludGVycnVw dGlibGUoc3RydWN0IHd3X211dGV4ICpsb2NrLCBzdHJ1Y3Qgd3dfYWNxdWlyZV9jdHggKmN0eCkK IAltaWdodF9zbGVlcCgpOwogCiAJaWYgKF9fbXV0ZXhfdHJ5bG9ja19mYXN0KCZsb2NrLT5iYXNl KSkgewotCQl3d19tdXRleF9zZXRfY29udGV4dF9mYXN0cGF0aChsb2NrLCBjdHgpOworCQlpZiAo Y3R4KQorCQkJd3dfbXV0ZXhfc2V0X2NvbnRleHRfZmFzdHBhdGgobG9jaywgY3R4KTsKIAkJcmV0 dXJuIDA7CiAJfQogCi0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vZHJpLWRldmVsCg==