From patchwork Fri Jun 17 07:33:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9182731 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 693906075D for ; Fri, 17 Jun 2016 07:33:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 59C9725E13 for ; Fri, 17 Jun 2016 07:33:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4EE692839E; Fri, 17 Jun 2016 07:33:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 12CED25E13 for ; Fri, 17 Jun 2016 07:33:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E2D886EAF6; Fri, 17 Jun 2016 07:33:48 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3B8006E02D for ; Fri, 17 Jun 2016 07:33:46 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id m124so16468215wme.3 for ; Fri, 17 Jun 2016 00:33:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zKHzOUxLctY+5p/VzarKaRf7rPrflxswnCXlFV0HhG8=; b=lGynMLFDQX6/1zaUrOaxw/hZC62W2tDL+SU2BZXd7+X5CjKUXOOHgVN0ij6PCc3NPv V5vZa8wqAhKnmAKjilhg6hjTNj9JGx53L2xK3sZL+KCMXg0cH5xu4kkpdwbs/InW6SMh YmBvdiRWVOS8OzYf3oa4Wso10TkswokG4fsx4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zKHzOUxLctY+5p/VzarKaRf7rPrflxswnCXlFV0HhG8=; b=Yq8Tlz8M07EcAc6KAsuV6d8k0If4sCSnquEbBsXUmi9zqacp88jkXAKy4hBsruT/8g TzUY8Vwhy2v2yrX05mgphAGqZ7BBCRnzt1eKEXyJYtp7UvkP3NUndwRwuAUNjEnUKY8h TeXqUSriHxTv/SENkhx2dLZ85BGon+jIL+wNa3yabLwwxu7d5/USN21lnFLWvPeu7o0Y 1h7AWTKTny4xOpnS5K2Psg+CxC48clF6W54CzSSUrdvAtqLl3up7eoMbQA711OsGbS3L J5TH6PnXBghB4lg3W8HaoDNjwH2KbqT3Ck/O57Q3XiFktfthl9YfAJ/RW48jGFq3yq4d 74vA== X-Gm-Message-State: ALyK8tKxqOCOG8MfT6ZgCiab2HBf3W53OCxRRm4CiRrfzCWK5zmnIY+roQqhnhZXkB9pxw== X-Received: by 10.194.23.100 with SMTP id l4mr779898wjf.118.1466148824482; Fri, 17 Jun 2016 00:33:44 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id s67sm1475049wmf.3.2016.06.17.00.33.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Jun 2016 00:33:43 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Fri, 17 Jun 2016 09:33:20 +0200 Message-Id: <1466148814-8194-3-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1466148814-8194-1-git-send-email-daniel.vetter@ffwll.ch> References: <1466148814-8194-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Daniel Vetter , Intel Graphics Development Subject: [Intel-gfx] [PATCH 02/16] drm: Move authmagic cleanup into drm_master_release X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP It's related, and soon authmagic will also use the master_mutex. There is an ever-so-slightly semantic change here: - authmagic will only be cleaned up for primary_client drm_minors. But it's impossible to create authmagic on render/control nodes, so this is fine. - The cleanup is moved down a bit in the release processing. Doesn't matter at all since authmagic is purely internal logic used by the core ioctl access checks, and when we're in a file's release callback no one can do ioctls any more. v2: Rebased. Cc: Chris Wilson Reviewed-by: Chris Wilson (v1) Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_auth.c | 5 +++++ drivers/gpu/drm/drm_fops.c | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c index 54ad64a6d052..24f0f2dc1cce 100644 --- a/drivers/gpu/drm/drm_auth.c +++ b/drivers/gpu/drm/drm_auth.c @@ -248,6 +248,11 @@ void drm_master_release(struct drm_file *file_priv) struct drm_device *dev = file_priv->minor->dev; struct drm_master *master = file_priv->master; + mutex_lock(&dev->struct_mutex); + if (file_priv->magic) + idr_remove(&file_priv->master->magic_map, file_priv->magic); + mutex_unlock(&dev->struct_mutex); + mutex_lock(&dev->master_mutex); if (!file_priv->is_master) goto out; diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c index f3b2677de882..f6dfdfcd018b 100644 --- a/drivers/gpu/drm/drm_fops.c +++ b/drivers/gpu/drm/drm_fops.c @@ -376,11 +376,6 @@ int drm_release(struct inode *inode, struct file *filp) list_del(&file_priv->lhead); mutex_unlock(&dev->filelist_mutex); - mutex_lock(&dev->struct_mutex); - if (file_priv->magic) - idr_remove(&file_priv->master->magic_map, file_priv->magic); - mutex_unlock(&dev->struct_mutex); - if (dev->driver->preclose) dev->driver->preclose(dev, file_priv);