From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH v8 1/2] drm: Unplug drm device when unregistering it Date: Wed, 26 Apr 2017 22:43:31 +0300 Message-ID: <20170426194331.GJ30290@intel.com> References: <1491965730-31393-1-git-send-email-jeffy.chen@rock-chips.com> <1491965730-31393-2-git-send-email-jeffy.chen@rock-chips.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 98BD66E5E5 for ; Wed, 26 Apr 2017 19:43:37 +0000 (UTC) Content-Disposition: inline In-Reply-To: <1491965730-31393-2-git-send-email-jeffy.chen@rock-chips.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Jeffy Chen Cc: dianders@chromium.org, marcheu@chromium.org, briannorris@chromium.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, tfiga@chromium.org, Daniel Vetter , zyw@rock-chips.com, Dave Airlie , hshi@chromium.org List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCBBcHIgMTIsIDIwMTcgYXQgMTA6NTU6MjlBTSArMDgwMCwgSmVmZnkgQ2hlbiB3cm90 ZToKPiBBZnRlciB1bmJpbmRpbmcgZHJtLCB0aGUgdXNlciBzcGFjZSBtYXkgc3RpbGwgb3ducyB0 aGUgZHJtIGRldiBmZCwgYW5kCj4gbWF5IHN0aWxsIGJlIGFibGUgdG8gY2FsbCBkcm0gaW9jdGwu Cj4gCj4gV2UncmUgdXNpbmcgYW4gdW5wbHVnZ2VkIHN0YXRlIHRvIHByZXZlbnQgc29tZXRoaW5n IGxpa2UgdGhhdCwgc28gbGV0J3MKPiByZXVzZSBpdCBoZXJlLgo+IAo+IEFsc28gZHJvcCBkcm1f dW5wbHVnX2RldiwgYmVjYXVzZSBpdCB3b3VsZCBiZSB1bnVzZWQgYWZ0ZXIgb3RoZXIgY2hhbmdl cy4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBKZWZmeSBDaGVuIDxqZWZmeS5jaGVuQHJvY2stY2hpcHMu Y29tPgo+IFJldmlld2VkLWJ5OiBTZWFuIFBhdWwgPHNlYW5wYXVsQGNocm9taXVtLm9yZz4KPiAK PiAtLS0KPiAKPiBDaGFuZ2VzIGluIHY4Ogo+IEZpeCBoYW5nIHdoZW4gdW5yZWdpc3RlcmluZyBk cm0gZGV2IHdpdGggb3Blbl9jb3VudCAwCj4gCj4gQ2hhbmdlcyBpbiB2NzoKPiBBZGRyZXNzIFNl YW4gUGF1bCA8c2VhbnBhdWxAY2hyb21pdW0ub3JnPidzIGNvbW1lbnRzLgo+IAo+IENoYW5nZXMg aW4gdjY6Cj4gQWRkcmVzcyBEYW5pZWwgVmV0dGVyIDxkYW5pZWxAZmZ3bGwuY2g+J3MgY29tbWVu dHMuCj4gCj4gQ2hhbmdlcyBpbiB2NToKPiBGaXggd3JvbmcgZ2l0IGFjY291bnQuCj4gCj4gQ2hh bmdlcyBpbiB2MjoKPiBGaXggc29tZSBjb21taXQgbWVzc2FnZXMuCj4gCj4gIGRyaXZlcnMvZ3B1 L2RybS9kcm1fZHJ2LmMgICAgIHwgMTkgKysrLS0tLS0tLS0tLS0tLS0tLQo+ICBkcml2ZXJzL2dw dS9kcm0vdWRsL3VkbF9kcnYuYyB8ICAyICstCj4gIGluY2x1ZGUvZHJtL2RybVAuaCAgICAgICAg ICAgIHwgIDUgKysrLS0KPiAgaW5jbHVkZS9kcm0vZHJtX2Rydi5oICAgICAgICAgfCAgMSAtCj4g IDQgZmlsZXMgY2hhbmdlZCwgNyBpbnNlcnRpb25zKCspLCAyMCBkZWxldGlvbnMoLSkKPiAKPiBk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9k cm1fZHJ2LmMKPiBpbmRleCBiNWM2YmI0Li5jYzJkMDE4IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMv Z3B1L2RybS9kcm1fZHJ2LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2Rydi5jCj4gQEAg LTM1NSwyMiArMzU1LDYgQEAgdm9pZCBkcm1fcHV0X2RldihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQo+ICB9Cj4gIEVYUE9SVF9TWU1CT0woZHJtX3B1dF9kZXYpOwo+ICAKPiAtdm9pZCBkcm1fdW5w bHVnX2RldihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+IC17Cj4gLQkvKiBmb3IgYSBVU0IgZGV2 aWNlICovCj4gLQlkcm1fZGV2X3VucmVnaXN0ZXIoZGV2KTsKPiAtCj4gLQltdXRleF9sb2NrKCZk cm1fZ2xvYmFsX211dGV4KTsKPiAtCj4gLQlkcm1fZGV2aWNlX3NldF91bnBsdWdnZWQoZGV2KTsK PiAtCj4gLQlpZiAoZGV2LT5vcGVuX2NvdW50ID09IDApIHsKPiAtCQlkcm1fcHV0X2RldihkZXYp Owo+IC0JfQo+IC0JbXV0ZXhfdW5sb2NrKCZkcm1fZ2xvYmFsX211dGV4KTsKPiAtfQo+IC1FWFBP UlRfU1lNQk9MKGRybV91bnBsdWdfZGV2KTsKPiAtCj4gIC8qCj4gICAqIERSTSBpbnRlcm5hbCBt b3VudAo+ICAgKiBXZSB3YW50IHRvIGJlIGFibGUgdG8gYWxsb2NhdGUgb3VyIG93biAic3RydWN0 IGFkZHJlc3Nfc3BhY2UiIHRvIGNvbnRyb2wKPiBAQCAtNzg3LDYgKzc3MSw4IEBAIGludCBkcm1f ZGV2X3JlZ2lzdGVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGxvbmcgZmxhZ3Mp Cj4gIAlpZiAoZHJtX2NvcmVfY2hlY2tfZmVhdHVyZShkZXYsIERSSVZFUl9NT0RFU0VUKSkKPiAg CQlkcm1fbW9kZXNldF9yZWdpc3Rlcl9hbGwoZGV2KTsKPiAgCj4gKwlkcm1fZGV2aWNlX3NldF9w bHVnX3N0YXRlKGRldiwgdHJ1ZSk7CgpUaGlzIG1ha2VzIG1lIHRoaW5rIHRoaXMgaGFzIHNvbWV0 aGluZyB0byBkbyB3aXRoIGFjdHVhbCBwbHVncywgYmUKdGhleSB0aGUgYmF0aCB0dWIga2luZCBv ciBzb21lICphaGVtKiBvdGhlciBraW5kLgoKL21ldGhpbmtzIHRoaXMgc2hvdWxkIGF0IGxlYXN0 IGJlIGNhbGxlZCBzZXRfcGx1Z2dlZF9zdGF0ZSBvcgpzb21ldGhpbmcgbGlrZSB0aGF0LiBPciBt YXliZSB0aGVyZSdzIGFuIGV2ZW4gYmV0dGVyIG5hbWUgdGhhdApjb3VsZCBiZSB1c2VkPwoKPiAr Cj4gIAlyZXQgPSAwOwo+ICAKPiAgCURSTV9JTkZPKCJJbml0aWFsaXplZCAlcyAlZC4lZC4lZCAl cyBmb3IgJXMgb24gbWlub3IgJWRcbiIsCj4gQEAgLTgyNiw2ICs4MTIsNyBAQCB2b2lkIGRybV9k ZXZfdW5yZWdpc3RlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICAJZHJtX2xhc3RjbG9zZShk ZXYpOwo+ICAKPiAgCWRldi0+cmVnaXN0ZXJlZCA9IGZhbHNlOwo+ICsJZHJtX2RldmljZV9zZXRf cGx1Z19zdGF0ZShkZXYsIGZhbHNlKTsKPiAgCj4gIAlpZiAoZHJtX2NvcmVfY2hlY2tfZmVhdHVy ZShkZXYsIERSSVZFUl9NT0RFU0VUKSkKPiAgCQlkcm1fbW9kZXNldF91bnJlZ2lzdGVyX2FsbChk ZXYpOwo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdWRsL3VkbF9kcnYuYyBiL2RyaXZl cnMvZ3B1L2RybS91ZGwvdWRsX2Rydi5jCj4gaW5kZXggY2Q4YjAxNy4uNWRiZDkxNiAxMDA2NDQK PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vdWRsL3VkbF9kcnYuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1 L2RybS91ZGwvdWRsX2Rydi5jCj4gQEAgLTEwOCw3ICsxMDgsNyBAQCBzdGF0aWMgdm9pZCB1ZGxf dXNiX2Rpc2Nvbm5lY3Qoc3RydWN0IHVzYl9pbnRlcmZhY2UgKmludGVyZmFjZSkKPiAgCWRybV9r bXNfaGVscGVyX3BvbGxfZGlzYWJsZShkZXYpOwo+ICAJdWRsX2ZiZGV2X3VucGx1ZyhkZXYpOwo+ ICAJdWRsX2Ryb3BfdXNiKGRldik7Cj4gLQlkcm1fdW5wbHVnX2RldihkZXYpOwo+ICsJZHJtX2Rl dl91bnJlZ2lzdGVyKGRldik7Cj4gIH0KPiAgCj4gIC8qCj4gZGlmZiAtLWdpdCBhL2luY2x1ZGUv ZHJtL2RybVAuaCBiL2luY2x1ZGUvZHJtL2RybVAuaAo+IGluZGV4IDNiZmFmY2QuLmE5YTVhNjQg MTAwNjQ0Cj4gLS0tIGEvaW5jbHVkZS9kcm0vZHJtUC5oCj4gKysrIGIvaW5jbHVkZS9kcm0vZHJt UC5oCj4gQEAgLTQ4OCwxMCArNDg4LDExIEBAIHN0YXRpYyBfX2lubGluZV9fIGludCBkcm1fY29y ZV9jaGVja19mZWF0dXJlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gIAlyZXR1cm4gKChkZXYt PmRyaXZlci0+ZHJpdmVyX2ZlYXR1cmVzICYgZmVhdHVyZSkgPyAxIDogMCk7Cj4gIH0KPiAgCj4g LXN0YXRpYyBpbmxpbmUgdm9pZCBkcm1fZGV2aWNlX3NldF91bnBsdWdnZWQoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKPiArc3RhdGljIGlubGluZSB2b2lkIGRybV9kZXZpY2Vfc2V0X3BsdWdfc3Rh dGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiArCQkJCQkgICAgIGJvb2wgcGx1Z2dlZCkKPiAg ewo+ICAJc21wX3dtYigpOwo+IC0JYXRvbWljX3NldCgmZGV2LT51bnBsdWdnZWQsIDEpOwo+ICsJ YXRvbWljX3NldCgmZGV2LT51bnBsdWdnZWQsICFwbHVnZ2VkKTsKPiAgfQo+ICAKPiAgc3RhdGlj IGlubGluZSBpbnQgZHJtX2RldmljZV9pc191bnBsdWdnZWQoc3RydWN0IGRybV9kZXZpY2UgKmRl dikKPiBkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vZHJtX2Rydi5oIGIvaW5jbHVkZS9kcm0vZHJt X2Rydi5oCj4gaW5kZXggMGZlZmMzZi4uZWI2MzA3OCAxMDA2NDQKPiAtLS0gYS9pbmNsdWRlL2Ry bS9kcm1fZHJ2LmgKPiArKysgYi9pbmNsdWRlL2RybS9kcm1fZHJ2LmgKPiBAQCAtNTQ0LDcgKzU0 NCw2IEBAIHZvaWQgZHJtX2Rldl91bnJlZ2lzdGVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwo+ ICB2b2lkIGRybV9kZXZfcmVmKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwo+ICB2b2lkIGRybV9k ZXZfdW5yZWYoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Cj4gIHZvaWQgZHJtX3B1dF9kZXYoc3Ry dWN0IGRybV9kZXZpY2UgKmRldik7Cj4gLXZvaWQgZHJtX3VucGx1Z19kZXYoc3RydWN0IGRybV9k ZXZpY2UgKmRldik7Cj4gIAo+ICBpbnQgZHJtX2Rldl9zZXRfdW5pcXVlKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIGNvbnN0IGNoYXIgKm5hbWUpOwo+ICAKPiAtLSAKPiAyLjEuNAo+IAo+IAo+IF9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCj4gZHJpLWRldmVs IG1haWxpbmcgbGlzdAo+IGRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPiBodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAoKLS0gClZp bGxlIFN5cmrDpGzDpApJbnRlbCBPVEMKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967085AbdDZTnp (ORCPT ); Wed, 26 Apr 2017 15:43:45 -0400 Received: from mga07.intel.com ([134.134.136.100]:14418 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753986AbdDZTnh (ORCPT ); Wed, 26 Apr 2017 15:43:37 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,255,1488873600"; d="scan'208";a="79288057" Date: Wed, 26 Apr 2017 22:43:31 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jeffy Chen Cc: linux-kernel@vger.kernel.org, Dave Airlie , briannorris@chromium.org, dianders@chromium.org, tfiga@chromium.org, dri-devel@lists.freedesktop.org, Daniel Vetter , zyw@rock-chips.com, marcheu@chromium.org, hshi@chromium.org Subject: Re: [PATCH v8 1/2] drm: Unplug drm device when unregistering it Message-ID: <20170426194331.GJ30290@intel.com> References: <1491965730-31393-1-git-send-email-jeffy.chen@rock-chips.com> <1491965730-31393-2-git-send-email-jeffy.chen@rock-chips.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1491965730-31393-2-git-send-email-jeffy.chen@rock-chips.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Apr 12, 2017 at 10:55:29AM +0800, Jeffy Chen wrote: > After unbinding drm, the user space may still owns the drm dev fd, and > may still be able to call drm ioctl. > > We're using an unplugged state to prevent something like that, so let's > reuse it here. > > Also drop drm_unplug_dev, because it would be unused after other changes. > > Signed-off-by: Jeffy Chen > Reviewed-by: Sean Paul > > --- > > Changes in v8: > Fix hang when unregistering drm dev with open_count 0 > > Changes in v7: > Address Sean Paul 's comments. > > Changes in v6: > Address Daniel Vetter 's comments. > > Changes in v5: > Fix wrong git account. > > Changes in v2: > Fix some commit messages. > > drivers/gpu/drm/drm_drv.c | 19 +++---------------- > drivers/gpu/drm/udl/udl_drv.c | 2 +- > include/drm/drmP.h | 5 +++-- > include/drm/drm_drv.h | 1 - > 4 files changed, 7 insertions(+), 20 deletions(-) > > diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c > index b5c6bb4..cc2d018 100644 > --- a/drivers/gpu/drm/drm_drv.c > +++ b/drivers/gpu/drm/drm_drv.c > @@ -355,22 +355,6 @@ void drm_put_dev(struct drm_device *dev) > } > EXPORT_SYMBOL(drm_put_dev); > > -void drm_unplug_dev(struct drm_device *dev) > -{ > - /* for a USB device */ > - drm_dev_unregister(dev); > - > - mutex_lock(&drm_global_mutex); > - > - drm_device_set_unplugged(dev); > - > - if (dev->open_count == 0) { > - drm_put_dev(dev); > - } > - mutex_unlock(&drm_global_mutex); > -} > -EXPORT_SYMBOL(drm_unplug_dev); > - > /* > * DRM internal mount > * We want to be able to allocate our own "struct address_space" to control > @@ -787,6 +771,8 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags) > if (drm_core_check_feature(dev, DRIVER_MODESET)) > drm_modeset_register_all(dev); > > + drm_device_set_plug_state(dev, true); This makes me think this has something to do with actual plugs, be they the bath tub kind or some *ahem* other kind. /methinks this should at least be called set_plugged_state or something like that. Or maybe there's an even better name that could be used? > + > ret = 0; > > DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n", > @@ -826,6 +812,7 @@ void drm_dev_unregister(struct drm_device *dev) > drm_lastclose(dev); > > dev->registered = false; > + drm_device_set_plug_state(dev, false); > > if (drm_core_check_feature(dev, DRIVER_MODESET)) > drm_modeset_unregister_all(dev); > diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c > index cd8b017..5dbd916 100644 > --- a/drivers/gpu/drm/udl/udl_drv.c > +++ b/drivers/gpu/drm/udl/udl_drv.c > @@ -108,7 +108,7 @@ static void udl_usb_disconnect(struct usb_interface *interface) > drm_kms_helper_poll_disable(dev); > udl_fbdev_unplug(dev); > udl_drop_usb(dev); > - drm_unplug_dev(dev); > + drm_dev_unregister(dev); > } > > /* > diff --git a/include/drm/drmP.h b/include/drm/drmP.h > index 3bfafcd..a9a5a64 100644 > --- a/include/drm/drmP.h > +++ b/include/drm/drmP.h > @@ -488,10 +488,11 @@ static __inline__ int drm_core_check_feature(struct drm_device *dev, > return ((dev->driver->driver_features & feature) ? 1 : 0); > } > > -static inline void drm_device_set_unplugged(struct drm_device *dev) > +static inline void drm_device_set_plug_state(struct drm_device *dev, > + bool plugged) > { > smp_wmb(); > - atomic_set(&dev->unplugged, 1); > + atomic_set(&dev->unplugged, !plugged); > } > > static inline int drm_device_is_unplugged(struct drm_device *dev) > diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h > index 0fefc3f..eb63078 100644 > --- a/include/drm/drm_drv.h > +++ b/include/drm/drm_drv.h > @@ -544,7 +544,6 @@ void drm_dev_unregister(struct drm_device *dev); > void drm_dev_ref(struct drm_device *dev); > void drm_dev_unref(struct drm_device *dev); > void drm_put_dev(struct drm_device *dev); > -void drm_unplug_dev(struct drm_device *dev); > > int drm_dev_set_unique(struct drm_device *dev, const char *name); > > -- > 2.1.4 > > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Ville Syrjälä Intel OTC