From: "StDenis, Tom" Subject: [PATCH] add missing mutex lock to amdgpu_get_xgmi_hive() (v3) Date: Mon, 7 Jan 2019 17:31:48 +0000 Message-ID: <20190107173140.16797-1-tom.stdenis@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Language: en-US 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" Cc: "StDenis, Tom" djI6IE1vdmUgbG9ja3MgYXJvdW5kIGluIG90aGVyIGZ1bmN0aW9ucyBzbyB0aGF0IHRoaXMKZnVu Y3Rpb24gY2FuIHN0YW5kIG9uIGl0cyBvd24uICBBbHNvIG9ubHkgaG9sZCB0aGUgaGl2ZQpzcGVj aWZpYyBsb2NrIGZvciBhZGQvcmVtb3ZlIGRldmljZSBpbnN0ZWFkIG9mIHRoZSBkcml2ZXIKZ2xv YmFsIGxvY2sgc28geW91IGNhbid0IGFkZC9yZW1vdmUgZGV2aWNlcyBpbiBwYXJhbGxlbCBmcm9t Cm9uZSBoaXZlLgoKdjM6IGFkZCByZXNldF9sb2NrCgpTaWduZWQtb2ZmLWJ5OiBUb20gU3QgRGVu aXMgPHRvbS5zdGRlbmlzQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1X2RldmljZS5jIHwgIDYgKystLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1k Z3B1X3hnbWkuYyAgIHwgNDEgKysrKysrKysrKysrKystLS0tLS0tLQogZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1X3hnbWkuaCAgIHwgIDUgKy0tCiAzIGZpbGVzIGNoYW5nZWQsIDMz IGluc2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdV9kZXZpY2UuYwppbmRleCAzOWQ1ZDA1OGIyYzcuLjFhNTU4ZGM0MWJhNiAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYwpAQCAtMzUyNSw5ICsz NTI1LDkgQEAgaW50IGFtZGdwdV9kZXZpY2VfZ3B1X3JlY292ZXIoc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYsCiAJICogYnkgZGlmZmVyZW50IG5vZGVzLiBObyBwb2ludCBhbHNvIHNpbmNlIHRo ZSBvbmUgbm9kZSBhbHJlYWR5IGV4ZWN1dGluZwogCSAqIHJlc2V0IHdpbGwgYWxzbyByZXNldCBh bGwgdGhlIG90aGVyIG5vZGVzIGluIHRoZSBoaXZlLgogCSAqLwotCWhpdmUgPSBhbWRncHVfZ2V0 X3hnbWlfaGl2ZShhZGV2KTsKKwloaXZlID0gYW1kZ3B1X2dldF94Z21pX2hpdmUoYWRldiwgMCk7 CiAJaWYgKGhpdmUgJiYgYWRldi0+Z21jLnhnbWkubnVtX3BoeXNpY2FsX25vZGVzID4gMSAmJgot CSAgICAhbXV0ZXhfdHJ5bG9jaygmaGl2ZS0+aGl2ZV9sb2NrKSkKKwkgICAgIW11dGV4X3RyeWxv Y2soJmhpdmUtPnJlc2V0X2xvY2spKQogCQlyZXR1cm4gMDsKIAogCS8qIFN0YXJ0IHdpdGggYWRl diBwcmUgYXNpYyByZXNldCBmaXJzdCBmb3Igc29mdCByZXNldCBjaGVjay4qLwpAQCAtMzYwNiw3 ICszNjA2LDcgQEAgaW50IGFtZGdwdV9kZXZpY2VfZ3B1X3JlY292ZXIoc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYsCiAJfQogCiAJaWYgKGhpdmUgJiYgYWRldi0+Z21jLnhnbWkubnVtX3BoeXNp Y2FsX25vZGVzID4gMSkKLQkJbXV0ZXhfdW5sb2NrKCZoaXZlLT5oaXZlX2xvY2spOworCQltdXRl eF91bmxvY2soJmhpdmUtPnJlc2V0X2xvY2spOwogCiAJaWYgKHIpCiAJCWRldl9pbmZvKGFkZXYt PmRldiwgIkdQVSByZXNldCBlbmQgd2l0aCByZXQgPSAlZFxuIiwgcik7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfeGdtaS5jIGIvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1X3hnbWkuYwppbmRleCA4YThiYzYwY2I2YjQuLjllOThhYjhiMTUy NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3hnbWkuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfeGdtaS5jCkBAIC00MCwyNiAr NDAsNDAgQEAgdm9pZCAqYW1kZ3B1X3hnbWlfaGl2ZV90cnlfbG9jayhzdHJ1Y3QgYW1kZ3B1X2hp dmVfaW5mbyAqaGl2ZSkKIAlyZXR1cm4gJmhpdmUtPmRldmljZV9saXN0OwogfQogCi1zdHJ1Y3Qg YW1kZ3B1X2hpdmVfaW5mbyAqYW1kZ3B1X2dldF94Z21pX2hpdmUoc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYpCitzdHJ1Y3QgYW1kZ3B1X2hpdmVfaW5mbyAqYW1kZ3B1X2dldF94Z21pX2hpdmUo c3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIGludCBsb2NrKQogewogCWludCBpOwogCXN0cnVj dCBhbWRncHVfaGl2ZV9pbmZvICp0bXA7CiAKIAlpZiAoIWFkZXYtPmdtYy54Z21pLmhpdmVfaWQp CiAJCXJldHVybiBOVUxMOworCisJbXV0ZXhfbG9jaygmeGdtaV9tdXRleCk7CisKIAlmb3IgKGkg PSAwIDsgaSA8IGhpdmVfY291bnQ7ICsraSkgewogCQl0bXAgPSAmeGdtaV9oaXZlc1tpXTsKLQkJ aWYgKHRtcC0+aGl2ZV9pZCA9PSBhZGV2LT5nbWMueGdtaS5oaXZlX2lkKQorCQlpZiAodG1wLT5o aXZlX2lkID09IGFkZXYtPmdtYy54Z21pLmhpdmVfaWQpIHsKKwkJCWlmIChsb2NrKQorCQkJCW11 dGV4X2xvY2soJnRtcC0+aGl2ZV9sb2NrKTsKKwkJCW11dGV4X3VubG9jaygmeGdtaV9tdXRleCk7 CiAJCQlyZXR1cm4gdG1wOworCQl9CiAJfQotCWlmIChpID49IEFNREdQVV9NQVhfWEdNSV9ISVZF KQorCWlmIChpID49IEFNREdQVV9NQVhfWEdNSV9ISVZFKSB7CisJCW11dGV4X3VubG9jaygmeGdt aV9tdXRleCk7CiAJCXJldHVybiBOVUxMOworCX0KIAogCS8qIGluaXRpYWxpemUgbmV3IGhpdmUg aWYgbm90IGV4aXN0ICovCiAJdG1wID0gJnhnbWlfaGl2ZXNbaGl2ZV9jb3VudCsrXTsKIAl0bXAt PmhpdmVfaWQgPSBhZGV2LT5nbWMueGdtaS5oaXZlX2lkOwogCUlOSVRfTElTVF9IRUFEKCZ0bXAt PmRldmljZV9saXN0KTsKIAltdXRleF9pbml0KCZ0bXAtPmhpdmVfbG9jayk7CisJbXV0ZXhfaW5p dCgmdG1wLT5yZXNldF9sb2NrKTsKKwlpZiAobG9jaykKKwkJbXV0ZXhfbG9jaygmdG1wLT5oaXZl X2xvY2spOworCisJbXV0ZXhfdW5sb2NrKCZ4Z21pX211dGV4KTsKIAogCXJldHVybiB0bXA7CiB9 CkBAIC0xMTEsOCArMTI1LDggQEAgaW50IGFtZGdwdV94Z21pX2FkZF9kZXZpY2Uoc3RydWN0IGFt ZGdwdV9kZXZpY2UgKmFkZXYpCiAJCXJldHVybiByZXQ7CiAJfQogCi0JbXV0ZXhfbG9jaygmeGdt aV9tdXRleCk7Ci0JaGl2ZSA9IGFtZGdwdV9nZXRfeGdtaV9oaXZlKGFkZXYpOworCS8qIGZpbmQg aGl2ZSBhbmQgdGFrZSBsb2NrICovCisJaGl2ZSA9IGFtZGdwdV9nZXRfeGdtaV9oaXZlKGFkZXYs IDEpOwogCWlmICghaGl2ZSkKIAkJZ290byBleGl0OwogCkBAIC0xNDIsOCArMTU2LDggQEAgaW50 IGFtZGdwdV94Z21pX2FkZF9kZXZpY2Uoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJCQli cmVhazsKIAl9CiAKKwltdXRleF91bmxvY2soJmhpdmUtPmhpdmVfbG9jayk7CiBleGl0OgotCW11 dGV4X3VubG9jaygmeGdtaV9tdXRleCk7CiAJcmV0dXJuIHJldDsKIH0KIApAQCAtMTU0LDE1ICsx NjgsMTQgQEAgdm9pZCBhbWRncHVfeGdtaV9yZW1vdmVfZGV2aWNlKHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2KQogCWlmICghYWRldi0+Z21jLnhnbWkuc3VwcG9ydGVkKQogCQlyZXR1cm47CiAK LQltdXRleF9sb2NrKCZ4Z21pX211dGV4KTsKLQotCWhpdmUgPSBhbWRncHVfZ2V0X3hnbWlfaGl2 ZShhZGV2KTsKKwloaXZlID0gYW1kZ3B1X2dldF94Z21pX2hpdmUoYWRldiwgMSk7CiAJaWYgKCFo aXZlKQotCQlnb3RvIGV4aXQ7CisJCXJldHVybjsKIAotCWlmICghKGhpdmUtPm51bWJlcl9kZXZp Y2VzLS0pKQorCWlmICghKGhpdmUtPm51bWJlcl9kZXZpY2VzLS0pKSB7CiAJCW11dGV4X2Rlc3Ry b3koJmhpdmUtPmhpdmVfbG9jayk7Ci0KLWV4aXQ6Ci0JbXV0ZXhfdW5sb2NrKCZ4Z21pX211dGV4 KTsKKwkJbXV0ZXhfZGVzdHJveSgmaGl2ZS0+cmVzZXRfbG9jayk7CisJfSBlbHNlIHsKKwkJbXV0 ZXhfdW5sb2NrKCZoaXZlLT5oaXZlX2xvY2spOworCX0KIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV94Z21pLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9hbWRncHVfeGdtaS5oCmluZGV4IDYxNTFlYjljOGFkMy4uMTRiYzYwNjY0MTU5IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfeGdtaS5oCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV94Z21pLmgKQEAgLTI5LDEwICsyOSwxMSBA QCBzdHJ1Y3QgYW1kZ3B1X2hpdmVfaW5mbyB7CiAJc3RydWN0IGxpc3RfaGVhZAlkZXZpY2VfbGlz dDsKIAlzdHJ1Y3QgcHNwX3hnbWlfdG9wb2xvZ3lfaW5mbwl0b3BvbG9neV9pbmZvOwogCWludCBu dW1iZXJfZGV2aWNlczsKLQlzdHJ1Y3QgbXV0ZXggaGl2ZV9sb2NrOworCXN0cnVjdCBtdXRleCBo aXZlX2xvY2ssCisJCSAgICAgcmVzZXRfbG9jazsKIH07CiAKLXN0cnVjdCBhbWRncHVfaGl2ZV9p bmZvICphbWRncHVfZ2V0X3hnbWlfaGl2ZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldik7Citz dHJ1Y3QgYW1kZ3B1X2hpdmVfaW5mbyAqYW1kZ3B1X2dldF94Z21pX2hpdmUoc3RydWN0IGFtZGdw dV9kZXZpY2UgKmFkZXYsIGludCBsb2NrKTsKIGludCBhbWRncHVfeGdtaV91cGRhdGVfdG9wb2xv Z3koc3RydWN0IGFtZGdwdV9oaXZlX2luZm8gKmhpdmUsIHN0cnVjdCBhbWRncHVfZGV2aWNlICph ZGV2KTsKIGludCBhbWRncHVfeGdtaV9hZGRfZGV2aWNlKHN0cnVjdCBhbWRncHVfZGV2aWNlICph ZGV2KTsKIHZvaWQgYW1kZ3B1X3hnbWlfcmVtb3ZlX2RldmljZShzdHJ1Y3QgYW1kZ3B1X2Rldmlj ZSAqYWRldik7Ci0tIAoyLjE3LjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1k LWdmeAo=