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: Fri, 14 Oct 2016 13:17:55 +0100 Message-ID: <20161014121833.439-4-chris@chris-wilson.co.uk> References: <20161014121833.439-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-x243.google.com (mail-lf0-x243.google.com [IPv6:2a00:1450:4010:c07::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 82A126E098 for ; Fri, 14 Oct 2016 12:18:44 +0000 (UTC) Received: by mail-lf0-x243.google.com with SMTP id l131so15054439lfl.0 for ; Fri, 14 Oct 2016 05:18:44 -0700 (PDT) In-Reply-To: <20161014121833.439-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+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCB8ICAzIC0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW0uYyB8IDMzICsrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMiBmaWxl cyBjaGFuZ2VkLCAxMiBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaAppbmRleCA4MDc3ZDMyNWFhNzguLmYyNWU3MTM1NTdhMSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCkBAIC0xMzYwLDkgKzEzNjAsNiBAQCBzdHJ1Y3QgaTkxNV9nZW1fbW0gewog CSAqLwogCXN0cnVjdCBsaXN0X2hlYWQgdW5ib3VuZF9saXN0OwogCi0JLyoqIFByb3RlY3RzIGFj Y2VzcyB0byB0aGUgdXNlcmZhdWx0X2xpc3QgKi8KLQlzcGlubG9ja190IHVzZXJmYXVsdF9sb2Nr OwotCiAJLyoqIExpc3Qgb2YgYWxsIG9iamVjdHMgaW4gZ3R0X3NwYWNlLCBjdXJyZW50bHkgbW1h cGVkIGJ5IHVzZXJzcGFjZS4KIAkgKiBBbGwgb2JqZWN0cyB3aXRoaW4gdGhpcyBsaXN0IG11c3Qg YWxzbyBiZSBvbiBib3VuZF9saXN0LgogCSAqLwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXgg YjFkODVmYjdiMWU1Li4zOWVlMjhiZWM0NzUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAt MTg0MiwxMCArMTg0Miw4IEBAIGludCBpOTE1X2dlbV9mYXVsdChzdHJ1Y3Qgdm1fYXJlYV9zdHJ1 Y3QgKmFyZWEsIHN0cnVjdCB2bV9mYXVsdCAqdm1mKQogCiAJLyogTWFyayBhcyBiZWluZyBtbWFw cGVkIGludG8gdXNlcnNwYWNlIGZvciBsYXRlciByZXZvY2F0aW9uICovCiAJYXNzZXJ0X3JwbV93 YWtlbG9ja19oZWxkKGRldl9wcml2KTsKLQlzcGluX2xvY2soJmRldl9wcml2LT5tbS51c2VyZmF1 bHRfbG9jayk7CiAJaWYgKGxpc3RfZW1wdHkoJm9iai0+dXNlcmZhdWx0X2xpbmspKQogCQlsaXN0 X2FkZCgmb2JqLT51c2VyZmF1bHRfbGluaywgJmRldl9wcml2LT5tbS51c2VyZmF1bHRfbGlzdCk7 Ci0Jc3Bpbl91bmxvY2soJmRldl9wcml2LT5tbS51c2VyZmF1bHRfbG9jayk7CiAKIAkvKiBGaW5h bGx5LCByZW1hcCBpdCB1c2luZyB0aGUgbmV3IEdUVCBvZmZzZXQgKi8KIAlyZXQgPSByZW1hcF9p b19tYXBwaW5nKGFyZWEsCkBAIC0xOTIyLDcgKzE5MjAsNiBAQCB2b2lkCiBpOTE1X2dlbV9yZWxl YXNlX21tYXAoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIHsKIAlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqaTkxNSA9IHRvX2k5MTUob2JqLT5iYXNlLmRldik7Ci0JYm9vbCB6YXAg PSBmYWxzZTsKIAogCS8qIFNlcmlhbGlzYXRpb24gYmV0d2VlbiB1c2VyIEdUVCBhY2Nlc3MgYW5k IG91ciBjb2RlIGRlcGVuZHMgdXBvbgogCSAqIHJldm9raW5nIHRoZSBDUFUncyBQVEUgd2hpbHN0 IHRoZSBtdXRleCBpcyBoZWxkLiBUaGUgbmV4dCB1c2VyCkBAIC0xOTM1LDE1ICsxOTMyLDEwIEBA IGk5MTVfZ2VtX3JlbGVhc2VfbW1hcChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQog CWxvY2tkZXBfYXNzZXJ0X2hlbGQoJmk5MTUtPmRybS5zdHJ1Y3RfbXV0ZXgpOwogCWludGVsX3J1 bnRpbWVfcG1fZ2V0KGk5MTUpOwogCi0Jc3Bpbl9sb2NrKCZpOTE1LT5tbS51c2VyZmF1bHRfbG9j ayk7Ci0JaWYgKCFsaXN0X2VtcHR5KCZvYmotPnVzZXJmYXVsdF9saW5rKSkgewotCQlsaXN0X2Rl bF9pbml0KCZvYmotPnVzZXJmYXVsdF9saW5rKTsKLQkJemFwID0gdHJ1ZTsKLQl9Ci0Jc3Bpbl91 bmxvY2soJmk5MTUtPm1tLnVzZXJmYXVsdF9sb2NrKTsKLQlpZiAoIXphcCkKKwlpZiAobGlzdF9l bXB0eSgmb2JqLT51c2VyZmF1bHRfbGluaykpCiAJCWdvdG8gb3V0OwogCisJbGlzdF9kZWxfaW5p dCgmb2JqLT51c2VyZmF1bHRfbGluayk7CiAJZHJtX3ZtYV9ub2RlX3VubWFwKCZvYmotPmJhc2Uu dm1hX25vZGUsCiAJCQkgICBvYmotPmJhc2UuZGV2LT5hbm9uX2lub2RlLT5pX21hcHBpbmcpOwog CkBAIC0xOTYzLDIxICsxOTU1LDIxIEBAIG91dDoKIHZvaWQKIGk5MTVfZ2VtX3JlbGVhc2VfYWxs X21tYXBzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlzdHJ1Y3QgZHJt X2k5MTVfZ2VtX29iamVjdCAqb2JqOworCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmos ICpvbjsKIAotCXNwaW5fbG9jaygmZGV2X3ByaXYtPm1tLnVzZXJmYXVsdF9sb2NrKTsKLQl3aGls ZSAoKG9iaiA9IGxpc3RfZmlyc3RfZW50cnlfb3JfbnVsbCgmZGV2X3ByaXYtPm1tLnVzZXJmYXVs dF9saXN0LAotCQkJCQkgICAgICAgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QsCi0JCQkJCSAg ICAgICB1c2VyZmF1bHRfbGluaykpKSB7Ci0JCWxpc3RfZGVsX2luaXQoJm9iai0+dXNlcmZhdWx0 X2xpbmspOwotCQlzcGluX3VubG9jaygmZGV2X3ByaXYtPm1tLnVzZXJmYXVsdF9sb2NrKTsKKwkv KgorCSAqIE9ubHkgY2FsbGVkIGR1cmluZyBSUE0gc3VzcGVuZC4gQWxsIHVzZXJzIG9mIHRoZSB1 c2VyZmF1bHRfbGlzdAorCSAqIG11c3QgYmUgaG9sZGluZyBhbiBSUE0gd2FrZXJlZiB0byBlbnN1 cmUgdGhhdCB0aGlzIGNhbiBub3QKKwkgKiBydW4gY29uY3VycmVudGx5IHdpdGggdGhlbXNlbHZl cyAoYW5kIHVzZSB0aGUgc3RydWN0X211dGV4IGZvcgorCSAqIHByb3RlY3Rpb24gYmV0d2VlbiB0 aGVtc2VsdmVzKS4KKwkgKi8KIAorCWxpc3RfZm9yX2VhY2hfZW50cnlfc2FmZShvYmosIG9uLAor CQkJCSAmZGV2X3ByaXYtPm1tLnVzZXJmYXVsdF9saXN0LCB1c2VyZmF1bHRfbGluaykgeworCQls aXN0X2RlbF9pbml0KCZvYmotPnVzZXJmYXVsdF9saW5rKTsKIAkJZHJtX3ZtYV9ub2RlX3VubWFw KCZvYmotPmJhc2Uudm1hX25vZGUsCiAJCQkJICAgb2JqLT5iYXNlLmRldi0+YW5vbl9pbm9kZS0+ aV9tYXBwaW5nKTsKLQotCQlzcGluX2xvY2soJmRldl9wcml2LT5tbS51c2VyZmF1bHRfbG9jayk7 CiAJfQotCXNwaW5fdW5sb2NrKCZkZXZfcHJpdi0+bW0udXNlcmZhdWx0X2xvY2spOwogfQogCiAv KioKQEAgLTQ1MzIsNyArNDUyNCw2IEBAIGludCBpOTE1X2dlbV9pbml0KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiAJaW50IHJldDsKIAogCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsK LQlzcGluX2xvY2tfaW5pdCgmZGV2X3ByaXYtPm1tLnVzZXJmYXVsdF9sb2NrKTsKIAogCWlmICgh aTkxNS5lbmFibGVfZXhlY2xpc3RzKSB7CiAJCWRldl9wcml2LT5ndC5yZXN1bWUgPSBpbnRlbF9s ZWdhY3lfc3VibWlzc2lvbl9yZXN1bWU7Ci0tIAoyLjkuMwoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==