From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754585AbdDLPD2 (ORCPT ); Wed, 12 Apr 2017 11:03:28 -0400 Received: from mail-qt0-f172.google.com ([209.85.216.172]:36473 "EHLO mail-qt0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753254AbdDLPDY (ORCPT ); Wed, 12 Apr 2017 11:03:24 -0400 Date: Wed, 12 Apr 2017 11:03:21 -0400 From: Sean Paul To: Jeffy Chen Cc: linux-kernel@vger.kernel.org, briannorris@chromium.org, dianders@chromium.org, tfiga@chromium.org, seanpaul@chromium.org, zyw@rock-chips.com, marcheu@chromium.org, mark.yao@rock-chips.com, hshi@chromium.org, Daniel Vetter , Jani Nikula , dri-devel@lists.freedesktop.org, Chris Wilson , David Airlie , Tom Gundersen , Dave Airlie Subject: Re: [PATCH v9] drm: Unplug drm device when unregistering it Message-ID: <20170412150321.uqlbrkb55chajylq@art_vandelay> References: <1491987381-32533-1-git-send-email-jeffy.chen@rock-chips.com> <1491987381-32533-2-git-send-email-jeffy.chen@rock-chips.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1491987381-32533-2-git-send-email-jeffy.chen@rock-chips.com> User-Agent: NeoMutt/20170306-66-6ddb52-dirty (1.8.0) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Apr 12, 2017 at 04:56:21PM +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 > > Changes in v9: > Move drm_device_set_plug_state into drm_drv.c . > > Changes in v8: > Fix hang when unregistering drm dev with open_count 0. > > Changes in v7: > Add drm_device_set_plug_state helper. > > Changes in v6: > Reuse unplug status. > > Changes in v5: > Fix wrong git account. > > Changes in v2: > Fix some commit messages. > Hi Jeffy, A couple bookkeeping notes: - Please end the commit message with your Signed-off-by tag - No need to send cover letters for one patch. All info should be in the commit message. Include superfluous information (such as tested on 4.4 kernel) after --- > --- > drivers/gpu/drm/drm_drv.c | 26 ++++++++++---------------- > drivers/gpu/drm/udl/udl_drv.c | 2 +- > include/drm/drmP.h | 6 ------ > include/drm/drm_drv.h | 1 - > 4 files changed, 11 insertions(+), 24 deletions(-) > > diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c > index b5c6bb4..e1da4d1 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 > @@ -733,6 +717,13 @@ static void remove_compat_control_link(struct drm_device *dev) > kfree(name); > } > > +static inline void drm_device_set_plug_state(struct drm_device *dev, > + bool plugged) > +{ > + smp_wmb(); > + atomic_set(&dev->unplugged, !plugged); > +} > + > /** > * drm_dev_register - Register DRM device > * @dev: Device to register > @@ -787,6 +778,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); > + > ret = 0; > > DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n", > @@ -826,6 +819,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); I think you need drm_dev_unref here as well. Sean > } > > /* > diff --git a/include/drm/drmP.h b/include/drm/drmP.h > index 3bfafcd..980a204 100644 > --- a/include/drm/drmP.h > +++ b/include/drm/drmP.h > @@ -488,12 +488,6 @@ 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) > -{ > - smp_wmb(); > - atomic_set(&dev->unplugged, 1); > -} > - > static inline int drm_device_is_unplugged(struct drm_device *dev) > { > int ret = atomic_read(&dev->unplugged); > 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 > -- Sean Paul, Software Engineer, Google / Chromium OS From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sean Paul Subject: Re: [PATCH v9] drm: Unplug drm device when unregistering it Date: Wed, 12 Apr 2017 11:03:21 -0400 Message-ID: <20170412150321.uqlbrkb55chajylq@art_vandelay> References: <1491987381-32533-1-git-send-email-jeffy.chen@rock-chips.com> <1491987381-32533-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 mail-qt0-x236.google.com (mail-qt0-x236.google.com [IPv6:2607:f8b0:400d:c0d::236]) by gabe.freedesktop.org (Postfix) with ESMTPS id 107356E728 for ; Wed, 12 Apr 2017 15:03:24 +0000 (UTC) Received: by mail-qt0-x236.google.com with SMTP id m36so24406010qtb.0 for ; Wed, 12 Apr 2017 08:03:24 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1491987381-32533-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, Dave Airlie , briannorris@chromium.org, linux-kernel@vger.kernel.org, tfiga@chromium.org, dri-devel@lists.freedesktop.org, Daniel Vetter , zyw@rock-chips.com, marcheu@chromium.org, hshi@chromium.org List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCBBcHIgMTIsIDIwMTcgYXQgMDQ6NTY6MjFQTSArMDgwMCwgSmVmZnkgQ2hlbiB3cm90 ZToKPiBBZnRlciB1bmJpbmRpbmcgZHJtLCB0aGUgdXNlciBzcGFjZSBtYXkgc3RpbGwgb3ducyB0 aGUgZHJtIGRldiBmZCwgYW5kCj4gbWF5IHN0aWxsIGJlIGFibGUgdG8gY2FsbCBkcm0gaW9jdGwu Cj4gCj4gV2UncmUgdXNpbmcgYW4gdW5wbHVnZ2VkIHN0YXRlIHRvIHByZXZlbnQgc29tZXRoaW5n IGxpa2UgdGhhdCwgc28gbGV0J3MKPiByZXVzZSBpdCBoZXJlLgo+IAo+IEFsc28gZHJvcCBkcm1f dW5wbHVnX2RldiwgYmVjYXVzZSBpdCB3b3VsZCBiZSB1bnVzZWQgYWZ0ZXIgb3RoZXIgY2hhbmdl cy4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBKZWZmeSBDaGVuIDxqZWZmeS5jaGVuQHJvY2stY2hpcHMu Y29tPgo+IAo+IENoYW5nZXMgaW4gdjk6Cj4gTW92ZSBkcm1fZGV2aWNlX3NldF9wbHVnX3N0YXRl IGludG8gZHJtX2Rydi5jIC4KPiAKPiBDaGFuZ2VzIGluIHY4Ogo+IEZpeCBoYW5nIHdoZW4gdW5y ZWdpc3RlcmluZyBkcm0gZGV2IHdpdGggb3Blbl9jb3VudCAwLgo+IAo+IENoYW5nZXMgaW4gdjc6 Cj4gQWRkIGRybV9kZXZpY2Vfc2V0X3BsdWdfc3RhdGUgaGVscGVyLgo+IAo+IENoYW5nZXMgaW4g djY6Cj4gUmV1c2UgdW5wbHVnIHN0YXR1cy4KPiAKPiBDaGFuZ2VzIGluIHY1Ogo+IEZpeCB3cm9u ZyBnaXQgYWNjb3VudC4KPiAKPiBDaGFuZ2VzIGluIHYyOgo+IEZpeCBzb21lIGNvbW1pdCBtZXNz YWdlcy4KPiAKCkhpIEplZmZ5LApBIGNvdXBsZSBib29ra2VlcGluZyBub3RlczoKCi0gUGxlYXNl IGVuZCB0aGUgY29tbWl0IG1lc3NhZ2Ugd2l0aCB5b3VyIFNpZ25lZC1vZmYtYnkgdGFnCi0gTm8g bmVlZCB0byBzZW5kIGNvdmVyIGxldHRlcnMgZm9yIG9uZSBwYXRjaC4gQWxsIGluZm8gc2hvdWxk IGJlIGluIHRoZSBjb21taXQKICBtZXNzYWdlLiBJbmNsdWRlIHN1cGVyZmx1b3VzIGluZm9ybWF0 aW9uIChzdWNoIGFzIHRlc3RlZCBvbiA0LjQga2VybmVsKSBhZnRlcgogIC0tLQoKPiAtLS0KPiAg ZHJpdmVycy9ncHUvZHJtL2RybV9kcnYuYyAgICAgfCAyNiArKysrKysrKysrLS0tLS0tLS0tLS0t LS0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vdWRsL3VkbF9kcnYuYyB8ICAyICstCj4gIGluY2x1ZGUv ZHJtL2RybVAuaCAgICAgICAgICAgIHwgIDYgLS0tLS0tCj4gIGluY2x1ZGUvZHJtL2RybV9kcnYu aCAgICAgICAgIHwgIDEgLQo+ICA0IGZpbGVzIGNoYW5nZWQsIDExIGluc2VydGlvbnMoKyksIDI0 IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2Rydi5j IGIvZHJpdmVycy9ncHUvZHJtL2RybV9kcnYuYwo+IGluZGV4IGI1YzZiYjQuLmUxZGE0ZDEgMTAw NjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9kcnYuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1 L2RybS9kcm1fZHJ2LmMKPiBAQCAtMzU1LDIyICszNTUsNiBAQCB2b2lkIGRybV9wdXRfZGV2KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gIH0KPiAgRVhQT1JUX1NZTUJPTChkcm1fcHV0X2Rldik7 Cj4gIAo+IC12b2lkIGRybV91bnBsdWdfZGV2KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gLXsK PiAtCS8qIGZvciBhIFVTQiBkZXZpY2UgKi8KPiAtCWRybV9kZXZfdW5yZWdpc3RlcihkZXYpOwo+ IC0KPiAtCW11dGV4X2xvY2soJmRybV9nbG9iYWxfbXV0ZXgpOwo+IC0KPiAtCWRybV9kZXZpY2Vf c2V0X3VucGx1Z2dlZChkZXYpOwo+IC0KPiAtCWlmIChkZXYtPm9wZW5fY291bnQgPT0gMCkgewo+ IC0JCWRybV9wdXRfZGV2KGRldik7Cj4gLQl9Cj4gLQltdXRleF91bmxvY2soJmRybV9nbG9iYWxf bXV0ZXgpOwo+IC19Cj4gLUVYUE9SVF9TWU1CT0woZHJtX3VucGx1Z19kZXYpOwo+IC0KPiAgLyoK PiAgICogRFJNIGludGVybmFsIG1vdW50Cj4gICAqIFdlIHdhbnQgdG8gYmUgYWJsZSB0byBhbGxv Y2F0ZSBvdXIgb3duICJzdHJ1Y3QgYWRkcmVzc19zcGFjZSIgdG8gY29udHJvbAo+IEBAIC03MzMs NiArNzE3LDEzIEBAIHN0YXRpYyB2b2lkIHJlbW92ZV9jb21wYXRfY29udHJvbF9saW5rKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCj4gIAlrZnJlZShuYW1lKTsKPiAgfQo+ICAKPiArc3RhdGljIGlu bGluZSB2b2lkIGRybV9kZXZpY2Vfc2V0X3BsdWdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRl diwKPiArCQkJCQkgICAgIGJvb2wgcGx1Z2dlZCkKPiArewo+ICsJc21wX3dtYigpOwo+ICsJYXRv bWljX3NldCgmZGV2LT51bnBsdWdnZWQsICFwbHVnZ2VkKTsKPiArfQo+ICsKPiAgLyoqCj4gICAq IGRybV9kZXZfcmVnaXN0ZXIgLSBSZWdpc3RlciBEUk0gZGV2aWNlCj4gICAqIEBkZXY6IERldmlj ZSB0byByZWdpc3Rlcgo+IEBAIC03ODcsNiArNzc4LDggQEAgaW50IGRybV9kZXZfcmVnaXN0ZXIo c3RydWN0IGRybV9kZXZpY2UgKmRldiwgdW5zaWduZWQgbG9uZyBmbGFncykKPiAgCWlmIChkcm1f Y29yZV9jaGVja19mZWF0dXJlKGRldiwgRFJJVkVSX01PREVTRVQpKQo+ICAJCWRybV9tb2Rlc2V0 X3JlZ2lzdGVyX2FsbChkZXYpOwo+ICAKPiArCWRybV9kZXZpY2Vfc2V0X3BsdWdfc3RhdGUoZGV2 LCB0cnVlKTsKPiArCj4gIAlyZXQgPSAwOwo+ICAKPiAgCURSTV9JTkZPKCJJbml0aWFsaXplZCAl cyAlZC4lZC4lZCAlcyBmb3IgJXMgb24gbWlub3IgJWRcbiIsCj4gQEAgLTgyNiw2ICs4MTksNyBA QCB2b2lkIGRybV9kZXZfdW5yZWdpc3RlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICAJZHJt X2xhc3RjbG9zZShkZXYpOwo+ICAKPiAgCWRldi0+cmVnaXN0ZXJlZCA9IGZhbHNlOwo+ICsJZHJt X2RldmljZV9zZXRfcGx1Z19zdGF0ZShkZXYsIGZhbHNlKTsKPiAgCj4gIAlpZiAoZHJtX2NvcmVf Y2hlY2tfZmVhdHVyZShkZXYsIERSSVZFUl9NT0RFU0VUKSkKPiAgCQlkcm1fbW9kZXNldF91bnJl Z2lzdGVyX2FsbChkZXYpOwo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdWRsL3VkbF9k cnYuYyBiL2RyaXZlcnMvZ3B1L2RybS91ZGwvdWRsX2Rydi5jCj4gaW5kZXggY2Q4YjAxNy4uNWRi ZDkxNiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vdWRsL3VkbF9kcnYuYwo+ICsrKyBi L2RyaXZlcnMvZ3B1L2RybS91ZGwvdWRsX2Rydi5jCj4gQEAgLTEwOCw3ICsxMDgsNyBAQCBzdGF0 aWMgdm9pZCB1ZGxfdXNiX2Rpc2Nvbm5lY3Qoc3RydWN0IHVzYl9pbnRlcmZhY2UgKmludGVyZmFj ZSkKPiAgCWRybV9rbXNfaGVscGVyX3BvbGxfZGlzYWJsZShkZXYpOwo+ICAJdWRsX2ZiZGV2X3Vu cGx1ZyhkZXYpOwo+ICAJdWRsX2Ryb3BfdXNiKGRldik7Cj4gLQlkcm1fdW5wbHVnX2RldihkZXYp Owo+ICsJZHJtX2Rldl91bnJlZ2lzdGVyKGRldik7CgpJIHRoaW5rIHlvdSBuZWVkIGRybV9kZXZf dW5yZWYgaGVyZSBhcyB3ZWxsLgoKU2VhbgoKPiAgfQo+ICAKPiAgLyoKPiBkaWZmIC0tZ2l0IGEv aW5jbHVkZS9kcm0vZHJtUC5oIGIvaW5jbHVkZS9kcm0vZHJtUC5oCj4gaW5kZXggM2JmYWZjZC4u OTgwYTIwNCAxMDA2NDQKPiAtLS0gYS9pbmNsdWRlL2RybS9kcm1QLmgKPiArKysgYi9pbmNsdWRl L2RybS9kcm1QLmgKPiBAQCAtNDg4LDEyICs0ODgsNiBAQCBzdGF0aWMgX19pbmxpbmVfXyBpbnQg ZHJtX2NvcmVfY2hlY2tfZmVhdHVyZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+ICAJcmV0dXJu ICgoZGV2LT5kcml2ZXItPmRyaXZlcl9mZWF0dXJlcyAmIGZlYXR1cmUpID8gMSA6IDApOwo+ICB9 Cj4gIAo+IC1zdGF0aWMgaW5saW5lIHZvaWQgZHJtX2RldmljZV9zZXRfdW5wbHVnZ2VkKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCj4gLXsKPiAtCXNtcF93bWIoKTsKPiAtCWF0b21pY19zZXQoJmRl di0+dW5wbHVnZ2VkLCAxKTsKPiAtfQo+IC0KPiAgc3RhdGljIGlubGluZSBpbnQgZHJtX2Rldmlj ZV9pc191bnBsdWdnZWQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiAgewo+ICAJaW50IHJldCA9 IGF0b21pY19yZWFkKCZkZXYtPnVucGx1Z2dlZCk7Cj4gZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJt L2RybV9kcnYuaCBiL2luY2x1ZGUvZHJtL2RybV9kcnYuaAo+IGluZGV4IDBmZWZjM2YuLmViNjMw NzggMTAwNjQ0Cj4gLS0tIGEvaW5jbHVkZS9kcm0vZHJtX2Rydi5oCj4gKysrIGIvaW5jbHVkZS9k cm0vZHJtX2Rydi5oCj4gQEAgLTU0NCw3ICs1NDQsNiBAQCB2b2lkIGRybV9kZXZfdW5yZWdpc3Rl cihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKPiAgdm9pZCBkcm1fZGV2X3JlZihzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KTsKPiAgdm9pZCBkcm1fZGV2X3VucmVmKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpOwo+ICB2b2lkIGRybV9wdXRfZGV2KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwo+IC12b2lk IGRybV91bnBsdWdfZGV2KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwo+ICAKPiAgaW50IGRybV9k ZXZfc2V0X3VuaXF1ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBjb25zdCBjaGFyICpuYW1lKTsK PiAgCj4gLS0gCj4gMi4xLjQKPiAKCi0tIApTZWFuIFBhdWwsIFNvZnR3YXJlIEVuZ2luZWVyLCBH b29nbGUgLyBDaHJvbWl1bSBPUwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9k cmktZGV2ZWwK