From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 03/41] drm/i915: Remove superfluous locking around userfault_list Date: Thu, 20 Oct 2016 16:03:45 +0100 Message-ID: <20161020150423.4560-4-chris@chris-wilson.co.uk> References: <20161020150423.4560-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-lf0-x242.google.com (mail-lf0-x242.google.com [IPv6:2a00:1450:4010:c07::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id CBAEF6EB8B for ; Thu, 20 Oct 2016 15:04:34 +0000 (UTC) Received: by mail-lf0-x242.google.com with SMTP id l131so457591lfl.0 for ; Thu, 20 Oct 2016 08:04:34 -0700 (PDT) In-Reply-To: <20161020150423.4560-1-chris@chris-wilson.co.uk> 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 List-Id: intel-gfx@lists.freedesktop.org Tm93IHRoYXQgd2UgaGF2ZSByZWR1Y2VkIHRoZSBhY2Nlc3MgdG8gdGhlIGxpc3QgdG8gZWl0aGVy IChhKSB1bmRlciB0aGUKc3RydWN0X211dGV4IHdoaWxzdCBob2xkaW5nIHRoZSBSUE0gd2FrZXJl ZiAoc28gdGhhdCBjb25jdXJyZW50IHdyaXRlcnMgdG8KdGhlIGxpc3QgYXJlIHNlcmlhbGlzZWQg Ynkgc3RydWN0X211dGV4KSBhbmQgKGIpIHVuZGVyIHRoZSBhdG9taWMKcnVudGltZSBzdXNwZW5k ICh3aGljaCBjYW5ub3QgcnVuIGNvbmN1cnJlbnRseSB3aXRoIGFueSBvdGhlciBhY2Nlc3NvciBk dWUKdG8gdGhlIGF0b21pYyBuYXR1cmUgb2YgdGhlIHJ1bnRpbWUgc3VzcGVuZCkgd2UgY2FuIHJl bW92ZSB0aGUgZXh0cmEKbG9ja2luZyBhcm91bmQgdGhlIGxpc3QgaXRzZWxmLgoKU2lnbmVkLW9m Zi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ClJldmlld2VkLWJ5 OiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCB8ICAzIC0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYyB8IDMzICsrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLQog MiBmaWxlcyBjaGFuZ2VkLCAxMiBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaAppbmRleCA0ODljZjUyMDFlZTAuLmY0YWY0MDQ1MmRmZCAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0xMzYxLDkgKzEzNjEsNiBAQCBzdHJ1Y3QgaTkxNV9nZW1f bW0gewogCSAqLwogCXN0cnVjdCBsaXN0X2hlYWQgdW5ib3VuZF9saXN0OwogCi0JLyoqIFByb3Rl Y3RzIGFjY2VzcyB0byB0aGUgdXNlcmZhdWx0X2xpc3QgKi8KLQlzcGlubG9ja190IHVzZXJmYXVs dF9sb2NrOwotCiAJLyoqIExpc3Qgb2YgYWxsIG9iamVjdHMgaW4gZ3R0X3NwYWNlLCBjdXJyZW50 bHkgbW1hcGVkIGJ5IHVzZXJzcGFjZS4KIAkgKiBBbGwgb2JqZWN0cyB3aXRoaW4gdGhpcyBsaXN0 IG11c3QgYWxzbyBiZSBvbiBib3VuZF9saXN0LgogCSAqLwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMK aW5kZXggNzQ0OTM5ZjY1MmZjLi42NGE4OGNlNGIzYzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YwpAQCAtMTg0MiwxMCArMTg0Miw4IEBAIGludCBpOTE1X2dlbV9mYXVsdChzdHJ1Y3Qgdm1fYXJl YV9zdHJ1Y3QgKmFyZWEsIHN0cnVjdCB2bV9mYXVsdCAqdm1mKQogCiAJLyogTWFyayBhcyBiZWlu ZyBtbWFwcGVkIGludG8gdXNlcnNwYWNlIGZvciBsYXRlciByZXZvY2F0aW9uICovCiAJYXNzZXJ0 X3JwbV93YWtlbG9ja19oZWxkKGRldl9wcml2KTsKLQlzcGluX2xvY2soJmRldl9wcml2LT5tbS51 c2VyZmF1bHRfbG9jayk7CiAJaWYgKGxpc3RfZW1wdHkoJm9iai0+dXNlcmZhdWx0X2xpbmspKQog CQlsaXN0X2FkZCgmb2JqLT51c2VyZmF1bHRfbGluaywgJmRldl9wcml2LT5tbS51c2VyZmF1bHRf bGlzdCk7Ci0Jc3Bpbl91bmxvY2soJmRldl9wcml2LT5tbS51c2VyZmF1bHRfbG9jayk7CiAKIAkv KiBGaW5hbGx5LCByZW1hcCBpdCB1c2luZyB0aGUgbmV3IEdUVCBvZmZzZXQgKi8KIAlyZXQgPSBy ZW1hcF9pb19tYXBwaW5nKGFyZWEsCkBAIC0xOTIyLDcgKzE5MjAsNiBAQCB2b2lkCiBpOTE1X2dl bV9yZWxlYXNlX21tYXAoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIHsKIAlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSA9IHRvX2k5MTUob2JqLT5iYXNlLmRldik7Ci0JYm9v bCB6YXAgPSBmYWxzZTsKIAogCS8qIFNlcmlhbGlzYXRpb24gYmV0d2VlbiB1c2VyIEdUVCBhY2Nl c3MgYW5kIG91ciBjb2RlIGRlcGVuZHMgdXBvbgogCSAqIHJldm9raW5nIHRoZSBDUFUncyBQVEUg d2hpbHN0IHRoZSBtdXRleCBpcyBoZWxkLiBUaGUgbmV4dCB1c2VyCkBAIC0xOTM1LDE1ICsxOTMy LDEwIEBAIGk5MTVfZ2VtX3JlbGVhc2VfbW1hcChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAq b2JqKQogCWxvY2tkZXBfYXNzZXJ0X2hlbGQoJmk5MTUtPmRybS5zdHJ1Y3RfbXV0ZXgpOwogCWlu dGVsX3J1bnRpbWVfcG1fZ2V0KGk5MTUpOwogCi0Jc3Bpbl9sb2NrKCZpOTE1LT5tbS51c2VyZmF1 bHRfbG9jayk7Ci0JaWYgKCFsaXN0X2VtcHR5KCZvYmotPnVzZXJmYXVsdF9saW5rKSkgewotCQls aXN0X2RlbF9pbml0KCZvYmotPnVzZXJmYXVsdF9saW5rKTsKLQkJemFwID0gdHJ1ZTsKLQl9Ci0J c3Bpbl91bmxvY2soJmk5MTUtPm1tLnVzZXJmYXVsdF9sb2NrKTsKLQlpZiAoIXphcCkKKwlpZiAo bGlzdF9lbXB0eSgmb2JqLT51c2VyZmF1bHRfbGluaykpCiAJCWdvdG8gb3V0OwogCisJbGlzdF9k ZWxfaW5pdCgmb2JqLT51c2VyZmF1bHRfbGluayk7CiAJZHJtX3ZtYV9ub2RlX3VubWFwKCZvYmot PmJhc2Uudm1hX25vZGUsCiAJCQkgICBvYmotPmJhc2UuZGV2LT5hbm9uX2lub2RlLT5pX21hcHBp bmcpOwogCkBAIC0xOTYzLDIxICsxOTU1LDIxIEBAIGk5MTVfZ2VtX3JlbGVhc2VfbW1hcChzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogdm9pZAogaTkxNV9nZW1fcmVsZWFzZV9hbGxf bW1hcHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCXN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpvYmo7CisJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwg Km9uOwogCi0Jc3Bpbl9sb2NrKCZkZXZfcHJpdi0+bW0udXNlcmZhdWx0X2xvY2spOwotCXdoaWxl ICgob2JqID0gbGlzdF9maXJzdF9lbnRyeV9vcl9udWxsKCZkZXZfcHJpdi0+bW0udXNlcmZhdWx0 X2xpc3QsCi0JCQkJCSAgICAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCwKLQkJCQkJICAg ICAgIHVzZXJmYXVsdF9saW5rKSkpIHsKLQkJbGlzdF9kZWxfaW5pdCgmb2JqLT51c2VyZmF1bHRf bGluayk7Ci0JCXNwaW5fdW5sb2NrKCZkZXZfcHJpdi0+bW0udXNlcmZhdWx0X2xvY2spOworCS8q CisJICogT25seSBjYWxsZWQgZHVyaW5nIFJQTSBzdXNwZW5kLiBBbGwgdXNlcnMgb2YgdGhlIHVz ZXJmYXVsdF9saXN0CisJICogbXVzdCBiZSBob2xkaW5nIGFuIFJQTSB3YWtlcmVmIHRvIGVuc3Vy ZSB0aGF0IHRoaXMgY2FuIG5vdAorCSAqIHJ1biBjb25jdXJyZW50bHkgd2l0aCB0aGVtc2VsdmVz IChhbmQgdXNlIHRoZSBzdHJ1Y3RfbXV0ZXggZm9yCisJICogcHJvdGVjdGlvbiBiZXR3ZWVuIHRo ZW1zZWx2ZXMpLgorCSAqLwogCisJbGlzdF9mb3JfZWFjaF9lbnRyeV9zYWZlKG9iaiwgb24sCisJ CQkJICZkZXZfcHJpdi0+bW0udXNlcmZhdWx0X2xpc3QsIHVzZXJmYXVsdF9saW5rKSB7CisJCWxp c3RfZGVsX2luaXQoJm9iai0+dXNlcmZhdWx0X2xpbmspOwogCQlkcm1fdm1hX25vZGVfdW5tYXAo Jm9iai0+YmFzZS52bWFfbm9kZSwKIAkJCQkgICBvYmotPmJhc2UuZGV2LT5hbm9uX2lub2RlLT5p X21hcHBpbmcpOwotCi0JCXNwaW5fbG9jaygmZGV2X3ByaXYtPm1tLnVzZXJmYXVsdF9sb2NrKTsK IAl9Ci0Jc3Bpbl91bmxvY2soJmRldl9wcml2LT5tbS51c2VyZmF1bHRfbG9jayk7CiB9CiAKIC8q KgpAQCAtNDU0Nyw3ICs0NTM5LDYgQEAgaW50IGk5MTVfZ2VtX2luaXQoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKIAlpbnQgcmV0OwogCiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwot CXNwaW5fbG9ja19pbml0KCZkZXZfcHJpdi0+bW0udXNlcmZhdWx0X2xvY2spOwogCiAJaWYgKCFp OTE1LmVuYWJsZV9leGVjbGlzdHMpIHsKIAkJZGV2X3ByaXYtPmd0LnJlc3VtZSA9IGludGVsX2xl Z2FjeV9zdWJtaXNzaW9uX3Jlc3VtZTsKLS0gCjIuOS4zCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK