From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Nicolai=20H=C3=A4hnle?= Subject: [PATCH v3 04/12] locking/ww_mutex: Set use_ww_ctx even when locking without a context Date: Wed, 21 Dec 2016 19:46:32 +0100 Message-ID: <1482346000-9927-5-git-send-email-nhaehnle@gmail.com> References: <1482346000-9927-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-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id B23766E0F0 for ; Wed, 21 Dec 2016 18:46:53 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id u144so32073138wmu.0 for ; Wed, 21 Dec 2016 10:46:53 -0800 (PST) In-Reply-To: <1482346000-9927-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 bG9jayhsb2NrLCBOVUxMKSwgYnV0IHRoZXJlIGFyZSBhIGxvdCBvZiB0aGVtLgoKdjM6Ci0gdW5k byB0aGUgbW92aW5nIGFyb3VuZCBvZiB3dyBpbiBfX211dGV4X2xvY2tfY29tbW9uCgpDYzogUGV0 ZXIgWmlqbHN0cmEgPHBldGVyekBpbmZyYWRlYWQub3JnPgpDYzogSW5nbyBNb2xuYXIgPG1pbmdv QHJlZGhhdC5jb20+CkNjOiBNYWFydGVuIExhbmtob3JzdCA8ZGV2QG1ibGFua2hvcnN0Lm5sPgpD YzogRGFuaWVsIFZldHRlciA8ZGFuaWVsQGZmd2xsLmNoPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJp c0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn ClNpZ25lZC1vZmYtYnk6IE5pY29sYWkgSMOkaG5sZSA8Tmljb2xhaS5IYWVobmxlQGFtZC5jb20+ Ci0tLQogaW5jbHVkZS9saW51eC93d19tdXRleC5oIHwgMTEgKystLS0tLS0tLS0KIGtlcm5lbC9s b2NraW5nL211dGV4LmMgICB8IDI5ICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tCiAyIGZp bGVzIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDIxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2luY2x1ZGUvbGludXgvd3dfbXV0ZXguaCBiL2luY2x1ZGUvbGludXgvd3dfbXV0ZXguaApp bmRleCAyYmI1ZGViLi5hNTk2MGU1IDEwMDY0NAotLS0gYS9pbmNsdWRlL2xpbnV4L3d3X211dGV4 LmgKKysrIGIvaW5jbHVkZS9saW51eC93d19tdXRleC5oCkBAIC0yMjIsMTEgKzIyMiw3IEBAIGV4 dGVybiBpbnQgX19tdXN0X2NoZWNrIF9fd3dfbXV0ZXhfbG9ja19pbnRlcnJ1cHRpYmxlKHN0cnVj dCB3d19tdXRleCAqbG9jaywKICAqLwogc3RhdGljIGlubGluZSBpbnQgd3dfbXV0ZXhfbG9jayhz dHJ1Y3Qgd3dfbXV0ZXggKmxvY2ssIHN0cnVjdCB3d19hY3F1aXJlX2N0eCAqY3R4KQogewotCWlm IChjdHgpCi0JCXJldHVybiBfX3d3X211dGV4X2xvY2sobG9jaywgY3R4KTsKLQotCW11dGV4X2xv Y2soJmxvY2stPmJhc2UpOwotCXJldHVybiAwOworCXJldHVybiBfX3d3X211dGV4X2xvY2sobG9j aywgY3R4KTsKIH0KIAogLyoqCkBAIC0yNjIsMTAgKzI1OCw3IEBAIHN0YXRpYyBpbmxpbmUgaW50 IHd3X211dGV4X2xvY2soc3RydWN0IHd3X211dGV4ICpsb2NrLCBzdHJ1Y3Qgd3dfYWNxdWlyZV9j dHggKmN0CiBzdGF0aWMgaW5saW5lIGludCBfX211c3RfY2hlY2sgd3dfbXV0ZXhfbG9ja19pbnRl cnJ1cHRpYmxlKHN0cnVjdCB3d19tdXRleCAqbG9jaywKIAkJCQkJCQkgICBzdHJ1Y3Qgd3dfYWNx dWlyZV9jdHggKmN0eCkKIHsKLQlpZiAoY3R4KQotCQlyZXR1cm4gX193d19tdXRleF9sb2NrX2lu dGVycnVwdGlibGUobG9jaywgY3R4KTsKLQllbHNlCi0JCXJldHVybiBtdXRleF9sb2NrX2ludGVy cnVwdGlibGUoJmxvY2stPmJhc2UpOworCXJldHVybiBfX3d3X211dGV4X2xvY2tfaW50ZXJydXB0 aWJsZShsb2NrLCBjdHgpOwogfQogCiAvKioKZGlmZiAtLWdpdCBhL2tlcm5lbC9sb2NraW5nL211 dGV4LmMgYi9rZXJuZWwvbG9ja2luZy9tdXRleC5jCmluZGV4IDY2NzE4ZDYuLmE0MWJlYzIgMTAw NjQ0Ci0tLSBhL2tlcm5lbC9sb2NraW5nL211dGV4LmMKKysrIGIva2VybmVsL2xvY2tpbmcvbXV0 ZXguYwpAQCAtNDY3LDcgKzQ2Nyw3IEBAIHN0YXRpYyBib29sIG11dGV4X29wdGltaXN0aWNfc3Bp bihzdHJ1Y3QgbXV0ZXggKmxvY2ssCiAJZm9yICg7OykgewogCQlzdHJ1Y3QgdGFza19zdHJ1Y3Qg Km93bmVyOwogCi0JCWlmICh1c2Vfd3dfY3R4ICYmIHd3X2N0eC0+YWNxdWlyZWQgPiAwKSB7CisJ CWlmICh1c2Vfd3dfY3R4ICYmIHd3X2N0eCAmJiB3d19jdHgtPmFjcXVpcmVkID4gMCkgewogCQkJ c3RydWN0IHd3X211dGV4ICp3dzsKIAogCQkJd3cgPSBjb250YWluZXJfb2YobG9jaywgc3RydWN0 IHd3X211dGV4LCBiYXNlKTsKQEAgLTYzNSw4ICs2MzUsOSBAQCBfX211dGV4X2xvY2tfY29tbW9u KHN0cnVjdCBtdXRleCAqbG9jaywgbG9uZyBzdGF0ZSwgdW5zaWduZWQgaW50IHN1YmNsYXNzLAog CXN0cnVjdCB3d19tdXRleCAqd3c7CiAJaW50IHJldDsKIAotCWlmICh1c2Vfd3dfY3R4KSB7Ci0J CXd3ID0gY29udGFpbmVyX29mKGxvY2ssIHN0cnVjdCB3d19tdXRleCwgYmFzZSk7CisJd3cgPSBj b250YWluZXJfb2YobG9jaywgc3RydWN0IHd3X211dGV4LCBiYXNlKTsKKworCWlmICh1c2Vfd3df Y3R4ICYmIHd3X2N0eCkgewogCQlpZiAodW5saWtlbHkod3dfY3R4ID09IFJFQURfT05DRSh3dy0+ Y3R4KSkpCiAJCQlyZXR1cm4gLUVBTFJFQURZOwogCX0KQEAgLTY0OCw3ICs2NDksNyBAQCBfX211 dGV4X2xvY2tfY29tbW9uKHN0cnVjdCBtdXRleCAqbG9jaywgbG9uZyBzdGF0ZSwgdW5zaWduZWQg aW50IHN1YmNsYXNzLAogCSAgICBtdXRleF9vcHRpbWlzdGljX3NwaW4obG9jaywgd3dfY3R4LCB1 c2Vfd3dfY3R4LCBmYWxzZSkpIHsKIAkJLyogZ290IHRoZSBsb2NrLCB5YXkhICovCiAJCWxvY2tf YWNxdWlyZWQoJmxvY2stPmRlcF9tYXAsIGlwKTsKLQkJaWYgKHVzZV93d19jdHgpCisJCWlmICh1 c2Vfd3dfY3R4ICYmIHd3X2N0eCkKIAkJCXd3X211dGV4X3NldF9jb250ZXh0X2Zhc3RwYXRoKHd3 LCB3d19jdHgpOwogCQlwcmVlbXB0X2VuYWJsZSgpOwogCQlyZXR1cm4gMDsKQEAgLTY5NCw3ICs2 OTUsNyBAQCBfX211dGV4X2xvY2tfY29tbW9uKHN0cnVjdCBtdXRleCAqbG9jaywgbG9uZyBzdGF0 ZSwgdW5zaWduZWQgaW50IHN1YmNsYXNzLAogCQkJZ290byBlcnI7CiAJCX0KIAotCQlpZiAodXNl X3d3X2N0eCAmJiB3d19jdHgtPmFjcXVpcmVkID4gMCkgeworCQlpZiAodXNlX3d3X2N0eCAmJiB3 d19jdHggJiYgd3dfY3R4LT5hY3F1aXJlZCA+IDApIHsKIAkJCXJldCA9IF9fd3dfbXV0ZXhfbG9j a19jaGVja19zdGFtcChsb2NrLCB3d19jdHgpOwogCQkJaWYgKHJldCkKIAkJCQlnb3RvIGVycjsK QEAgLTczNSw3ICs3MzYsNyBAQCBfX211dGV4X2xvY2tfY29tbW9uKHN0cnVjdCBtdXRleCAqbG9j aywgbG9uZyBzdGF0ZSwgdW5zaWduZWQgaW50IHN1YmNsYXNzLAogCS8qIGdvdCB0aGUgbG9jayAt IGNsZWFudXAgYW5kIHJlam9pY2UhICovCiAJbG9ja19hY3F1aXJlZCgmbG9jay0+ZGVwX21hcCwg aXApOwogCi0JaWYgKHVzZV93d19jdHgpCisJaWYgKHVzZV93d19jdHggJiYgd3dfY3R4KQogCQl3 d19tdXRleF9zZXRfY29udGV4dF9zbG93cGF0aCh3dywgd3dfY3R4KTsKIAogCXNwaW5fdW5sb2Nr X211dGV4KCZsb2NrLT53YWl0X2xvY2ssIGZsYWdzKTsKQEAgLTgyMyw4ICs4MjQsOSBAQCBfX3d3 X211dGV4X2xvY2soc3RydWN0IHd3X211dGV4ICpsb2NrLCBzdHJ1Y3Qgd3dfYWNxdWlyZV9jdHgg KmN0eCkKIAogCW1pZ2h0X3NsZWVwKCk7CiAJcmV0ID0gIF9fbXV0ZXhfbG9ja19jb21tb24oJmxv Y2stPmJhc2UsIFRBU0tfVU5JTlRFUlJVUFRJQkxFLAotCQkJCSAgIDAsICZjdHgtPmRlcF9tYXAs IF9SRVRfSVBfLCBjdHgsIDEpOwotCWlmICghcmV0ICYmIGN0eC0+YWNxdWlyZWQgPiAxKQorCQkJ CSAgIDAsIGN0eCA/ICZjdHgtPmRlcF9tYXAgOiBOVUxMLCBfUkVUX0lQXywKKwkJCQkgICBjdHgs IDEpOworCWlmICghcmV0ICYmIGN0eCAmJiBjdHgtPmFjcXVpcmVkID4gMSkKIAkJcmV0dXJuIHd3 X211dGV4X2RlYWRsb2NrX2luamVjdGlvbihsb2NrLCBjdHgpOwogCiAJcmV0dXJuIHJldDsKQEAg LTgzOCw5ICs4NDAsMTAgQEAgX193d19tdXRleF9sb2NrX2ludGVycnVwdGlibGUoc3RydWN0IHd3 X211dGV4ICpsb2NrLCBzdHJ1Y3Qgd3dfYWNxdWlyZV9jdHggKmN0eCkKIAogCW1pZ2h0X3NsZWVw KCk7CiAJcmV0ID0gX19tdXRleF9sb2NrX2NvbW1vbigmbG9jay0+YmFzZSwgVEFTS19JTlRFUlJV UFRJQkxFLAotCQkJCSAgMCwgJmN0eC0+ZGVwX21hcCwgX1JFVF9JUF8sIGN0eCwgMSk7CisJCQkJ ICAwLCBjdHggPyAmY3R4LT5kZXBfbWFwIDogTlVMTCwgX1JFVF9JUF8sCisJCQkJICBjdHgsIDEp OwogCi0JaWYgKCFyZXQgJiYgY3R4LT5hY3F1aXJlZCA+IDEpCisJaWYgKCFyZXQgJiYgY3R4ICYm IGN0eC0+YWNxdWlyZWQgPiAxKQogCQlyZXR1cm4gd3dfbXV0ZXhfZGVhZGxvY2tfaW5qZWN0aW9u KGxvY2ssIGN0eCk7CiAKIAlyZXR1cm4gcmV0OwpAQCAtMTAyNyw3ICsxMDMwLDggQEAgX193d19t dXRleF9sb2NrKHN0cnVjdCB3d19tdXRleCAqbG9jaywgc3RydWN0IHd3X2FjcXVpcmVfY3R4ICpj dHgpCiAJbWlnaHRfc2xlZXAoKTsKIAogCWlmIChfX211dGV4X3RyeWxvY2tfZmFzdCgmbG9jay0+ YmFzZSkpIHsKLQkJd3dfbXV0ZXhfc2V0X2NvbnRleHRfZmFzdHBhdGgobG9jaywgY3R4KTsKKwkJ aWYgKGN0eCkKKwkJCXd3X211dGV4X3NldF9jb250ZXh0X2Zhc3RwYXRoKGxvY2ssIGN0eCk7CiAJ CXJldHVybiAwOwogCX0KIApAQCAtMTA0MSw3ICsxMDQ1LDggQEAgX193d19tdXRleF9sb2NrX2lu dGVycnVwdGlibGUoc3RydWN0IHd3X211dGV4ICpsb2NrLCBzdHJ1Y3Qgd3dfYWNxdWlyZV9jdHgg KmN0eCkKIAltaWdodF9zbGVlcCgpOwogCiAJaWYgKF9fbXV0ZXhfdHJ5bG9ja19mYXN0KCZsb2Nr LT5iYXNlKSkgewotCQl3d19tdXRleF9zZXRfY29udGV4dF9mYXN0cGF0aChsb2NrLCBjdHgpOwor CQlpZiAoY3R4KQorCQkJd3dfbXV0ZXhfc2V0X2NvbnRleHRfZmFzdHBhdGgobG9jaywgY3R4KTsK IAkJcmV0dXJuIDA7CiAJfQogCi0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vZHJpLWRldmVsCg==