Received: by 10.213.65.68 with SMTP id h4csp537073imn; Wed, 28 Mar 2018 08:11:55 -0700 (PDT) X-Google-Smtp-Source: AIpwx49U1GFdwq4AieXhK4hKt0ZxMJ42P9cK1yf1UWLGx870DPA9kr7Zo8p+S9NUjr0VxEJQiS2a X-Received: by 2002:a17:902:7502:: with SMTP id i2-v6mr4268679pll.220.1522249915932; Wed, 28 Mar 2018 08:11:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522249915; cv=none; d=google.com; s=arc-20160816; b=fKoH3wTM6M8d/DvriQgYztVvwuViGrsJMTw6/U1BN4PnCfl/ZZhuoLUaDGcWkCdZ8p K4ptfpbGlsoUSZwjwFGHxOQmSnc+KHyYj5tKXrij3qoEBUiU476b/6Fp7I65rmh0J+gP Dnv8IOOuLBu+0Mqp2MRL9+9idSw6GA9Hy4aeaNQS6w3pzlGk67BVOU7yOgdYnN5ndCc0 zaLs1na48FE/Ox3zvABQpeL+jGYHg/KsVm11vFUyHZ9+FNdjfwUkzVtVs8GrrdMnB0K3 6H2NE/hMXqmt43O/DdUqrRTLSMiBqlEXi3s922veI/At7v38q2u5QpTAX3kU1Ufklmjv lR6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-transfer-encoding:content-disposition:mime-version :references:mail-followup-to:message-id:subject:cc:to:from:date :dkim-signature:arc-authentication-results; bh=22YD5R29Yf2S0g8CwzzIZWrh2egnBPcYECOpUjdNgKs=; b=DCheQPQWQtcAzrpu6U9WBJJnAVFdsd9YAPOY+CyJwMHUfLZEDC8jaBfnkSy1h1YExJ s+HdEx6bNGNMDygQL13Uf5mJ4lQaeRdIA4H6xs7I7px69Sq3UuuVU6aJc/L4hoEVZJdc pEF3c+vV+b1nKZ9Z79gC9MKlzx9Yjo1CmwSMA4tWFYBrtQ3WXF0h6qXInZR8UrpzmVk/ GDddIsCZB+S/qZ4h9p6HUX/etMBeBEEWl4VRVBNEZ4yuHezsFLDC+Q0q1i42pS1RlpPN ftLFWpjY3TMtrAM15ZjolKYjA8pqYLiYjLuyS2XOlUT1IYPsv6uJSCBJx+fxcFaEyaYB Z7sw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@ffwll.ch header.s=google header.b=WGV6Xdh9; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o61-v6si3733805pld.646.2018.03.28.08.11.41; Wed, 28 Mar 2018 08:11:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@ffwll.ch header.s=google header.b=WGV6Xdh9; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753935AbeC1PJb (ORCPT + 99 others); Wed, 28 Mar 2018 11:09:31 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:51956 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753897AbeC1PJa (ORCPT ); Wed, 28 Mar 2018 11:09:30 -0400 Received: by mail-wm0-f67.google.com with SMTP id v21so5642394wmc.1 for ; Wed, 28 Mar 2018 08:09:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=sender:date:from:to:cc:subject:message-id:mail-followup-to :references:mime-version:content-disposition :content-transfer-encoding:in-reply-to:user-agent; bh=22YD5R29Yf2S0g8CwzzIZWrh2egnBPcYECOpUjdNgKs=; b=WGV6Xdh9UmhA/aHKe+4sAzaNgYAH8AdjxW4XRqvyqzzBe76ldMdnav0XcXKoSsc3ux zfX3kraD2020AA2u7Z3N1qtRXRXHgYZd9rsMMW/GR/Tcz9m1vkiSvNKqI13tGmTP5fnP kw3myPnphWW8I+9gK2Y8OxB3I7SCQkky2mu54= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :content-transfer-encoding:in-reply-to:user-agent; bh=22YD5R29Yf2S0g8CwzzIZWrh2egnBPcYECOpUjdNgKs=; b=kGyYN6wovMlcWPH/dioIpffctSsdfe4Ahvt/t9TJVGvOkfV0zbH4UGQk5OWvtv/ZR5 TvZg1Q/FM9Ng3pE1Q16Ul6JHS35Anlgi5SAuCy1ELzQpD0J3sKev+nltPeOD54NAYAwf Rb1VHpXf3FFlsih6sIyIz2zZzR+YgNhmxmIsDfGOFxVMRmd3z0gBjl657RutNMvIjK3c UNW7zU+/PXofjVJ+vXh6TNrfS7wuZIhEfBKdQDCs18lxka5aDOflG13+4DwmmW2T4tz1 li6/nfrY7ZkSmiPmAAQEJuG0k2KTT1SoJxsDOfvNUNDFp7a9SLXBEdyqEUBzJp0EL9oo sn0A== X-Gm-Message-State: AElRT7EHe9gL4idYCl4HBztA4wIsKfi+RHKXkwDKzt/IpCY7x5bOS02K UJRUNT1A5HuzksD4czDk7Fa4kQ== X-Received: by 10.80.174.177 with SMTP id e46mr3855948edd.61.1522249768968; Wed, 28 Mar 2018 08:09:28 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id g55sm2728501eda.15.2018.03.28.08.09.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Mar 2018 08:09:28 -0700 (PDT) Date: Wed, 28 Mar 2018 17:09:26 +0200 From: Daniel Vetter To: Oleksandr Andrushchenko Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, airlied@linux.ie, daniel.vetter@intel.com, seanpaul@chromium.org, gustavo@padovan.org, intel-gfx@lists.freedesktop.org, Oleksandr Andrushchenko Subject: Re: [PATCH] drm: Use srcu to protect drm_device.unplugged Message-ID: <20180328150926.GC3881@phenom.ffwll.local> Mail-Followup-To: Oleksandr Andrushchenko , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, airlied@linux.ie, daniel.vetter@intel.com, seanpaul@chromium.org, gustavo@padovan.org, intel-gfx@lists.freedesktop.org, Oleksandr Andrushchenko References: <1522222715-11814-1-git-send-email-andr2000@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1522222715-11814-1-git-send-email-andr2000@gmail.com> X-Operating-System: Linux phenom 4.15.0-1-amd64 User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Mar 28, 2018 at 10:38:35AM +0300, Oleksandr Andrushchenko wrote: > From: Noralf Tr?nnes > > Use srcu to protect drm_device.unplugged in a race free manner. > Drivers can use drm_dev_enter()/drm_dev_exit() to protect and mark > sections preventing access to device resources that are not available > after the device is gone. > > Suggested-by: Daniel Vetter > Signed-off-by: Noralf Tr?nnes > Signed-off-by: Oleksandr Andrushchenko > Reviewed-by: Oleksandr Andrushchenko > Tested-by: Oleksandr Andrushchenko > Cc: intel-gfx@lists.freedesktop.org Reviewed-by: Daniel Vetter Oleksandr, please push to drm-misc-next once you have dim tools setup up and everything. Thanks, Daniel > --- > drivers/gpu/drm/drm_drv.c | 54 ++++++++++++++++++++++++++++++++++++++++++----- > include/drm/drm_device.h | 9 +++++++- > include/drm/drm_drv.h | 15 +++++++++---- > 3 files changed, 68 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c > index a1b9338736e3..32a83b41ab61 100644 > --- a/drivers/gpu/drm/drm_drv.c > +++ b/drivers/gpu/drm/drm_drv.c > @@ -32,6 +32,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -75,6 +76,8 @@ static bool drm_core_init_complete = false; > > static struct dentry *drm_debugfs_root; > > +DEFINE_STATIC_SRCU(drm_unplug_srcu); > + > /* > * DRM Minors > * A DRM device can provide several char-dev interfaces on the DRM-Major. Each > @@ -318,18 +321,51 @@ void drm_put_dev(struct drm_device *dev) > } > EXPORT_SYMBOL(drm_put_dev); > > -static void drm_device_set_unplugged(struct drm_device *dev) > +/** > + * drm_dev_enter - Enter device critical section > + * @dev: DRM device > + * @idx: Pointer to index that will be passed to the matching drm_dev_exit() > + * > + * This function marks and protects the beginning of a section that should not > + * be entered after the device has been unplugged. The section end is marked > + * with drm_dev_exit(). Calls to this function can be nested. > + * > + * Returns: > + * True if it is OK to enter the section, false otherwise. > + */ > +bool drm_dev_enter(struct drm_device *dev, int *idx) > +{ > + *idx = srcu_read_lock(&drm_unplug_srcu); > + > + if (dev->unplugged) { > + srcu_read_unlock(&drm_unplug_srcu, *idx); > + return false; > + } > + > + return true; > +} > +EXPORT_SYMBOL(drm_dev_enter); > + > +/** > + * drm_dev_exit - Exit device critical section > + * @idx: index returned from drm_dev_enter() > + * > + * This function marks the end of a section that should not be entered after > + * the device has been unplugged. > + */ > +void drm_dev_exit(int idx) > { > - smp_wmb(); > - atomic_set(&dev->unplugged, 1); > + srcu_read_unlock(&drm_unplug_srcu, idx); > } > +EXPORT_SYMBOL(drm_dev_exit); > > /** > * drm_dev_unplug - unplug a DRM device > * @dev: DRM device > * > * This unplugs a hotpluggable DRM device, which makes it inaccessible to > - * userspace operations. Entry-points can use drm_dev_is_unplugged(). This > + * userspace operations. Entry-points can use drm_dev_enter() and > + * drm_dev_exit() to protect device resources in a race free manner. This > * essentially unregisters the device like drm_dev_unregister(), but can be > * called while there are still open users of @dev. > */ > @@ -338,10 +374,18 @@ void drm_dev_unplug(struct drm_device *dev) > drm_dev_unregister(dev); > > mutex_lock(&drm_global_mutex); > - drm_device_set_unplugged(dev); > if (dev->open_count == 0) > drm_dev_put(dev); > mutex_unlock(&drm_global_mutex); > + > + /* > + * After synchronizing any critical read section is guaranteed to see > + * the new value of ->unplugged, and any critical section which might > + * still have seen the old value of ->unplugged is guaranteed to have > + * finished. > + */ > + dev->unplugged = true; > + synchronize_srcu(&drm_unplug_srcu); > } > EXPORT_SYMBOL(drm_dev_unplug); > > diff --git a/include/drm/drm_device.h b/include/drm/drm_device.h > index 7c4fa32f3fc6..3a0eac2885b7 100644 > --- a/include/drm/drm_device.h > +++ b/include/drm/drm_device.h > @@ -46,7 +46,14 @@ struct drm_device { > /* currently active master for this device. Protected by master_mutex */ > struct drm_master *master; > > - atomic_t unplugged; /**< Flag whether dev is dead */ > + /** > + * @unplugged: > + * > + * Flag to tell if the device has been unplugged. > + * See drm_dev_enter() and drm_dev_is_unplugged(). > + */ > + bool unplugged; > + > struct inode *anon_inode; /**< inode for private address-space */ > char *unique; /**< unique name of the device */ > /*@} */ > diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h > index d23dcdd1bd95..7e545f5f94d3 100644 > --- a/include/drm/drm_drv.h > +++ b/include/drm/drm_drv.h > @@ -624,6 +624,8 @@ void drm_dev_get(struct drm_device *dev); > void drm_dev_put(struct drm_device *dev); > void drm_dev_unref(struct drm_device *dev); > void drm_put_dev(struct drm_device *dev); > +bool drm_dev_enter(struct drm_device *dev, int *idx); > +void drm_dev_exit(int idx); > void drm_dev_unplug(struct drm_device *dev); > > /** > @@ -635,11 +637,16 @@ void drm_dev_unplug(struct drm_device *dev); > * unplugged, these two functions guarantee that any store before calling > * drm_dev_unplug() is visible to callers of this function after it completes > */ > -static inline int drm_dev_is_unplugged(struct drm_device *dev) > +static inline bool drm_dev_is_unplugged(struct drm_device *dev) > { > - int ret = atomic_read(&dev->unplugged); > - smp_rmb(); > - return ret; > + int idx; > + > + if (drm_dev_enter(dev, &idx)) { > + drm_dev_exit(idx); > + return false; > + } > + > + return true; > } > > > -- > 2.7.4 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch