From patchwork Thu Jul 9 21:32:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6759861 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8ABD3C05AC for ; Thu, 9 Jul 2015 21:30:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C454520790 for ; Thu, 9 Jul 2015 21:30:24 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id CDC6E207A1 for ; Thu, 9 Jul 2015 21:30:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 12D097A082; Thu, 9 Jul 2015 14:30:23 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6D2507A018 for ; Thu, 9 Jul 2015 14:30:21 -0700 (PDT) Received: by wiga1 with SMTP id a1so323697133wig.0 for ; Thu, 09 Jul 2015 14:30:20 -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=sg8FJbdT9xvaamiVCs6YEz7Wiygy9mFX67b6Vc0Jesc=; b=RPlb1E9Io8MSbzBAW6umtZdoI2t+SM5i4t2fBexm6C2//xUUyM2qMHARES3cpq3KPD SkcCqNztoyY8J48eG1+0XEwbANZftntx0s6GGqkEk4upT9v73ulZKbyLESK37ICfQPfu vXGa7QtXy42V+kSiSuUcvrAxzowYLMtKV2l4g= 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=sg8FJbdT9xvaamiVCs6YEz7Wiygy9mFX67b6Vc0Jesc=; b=FnGIQlbfxj1WVYH7To9ngbARjAV9TK7B7NVP5OOfiRtDLVv538vms+VGppyuKTDdjN GvRJtOKSgDDEEi70Lu2z2vb2Y8ijlcCehEQMPr7DDqmPuFvuZBJrhqtr5IvmJ+Dz/qfT TuS7PUhYvmo7swU3tFnS9LBcReJS4sjnYK7uc0VY0tOECKgINsmWXbGeujGtzTjbN+RU daT7+xUPyJ9vStk64FrNMr3QlkD3Jk0+sI61WrUdJdSjwQ3I6wU1HLKO4YLleSEwwSsz OvZGb9Z4MWioKTbl6yQa5nbVhErd8HIizv7YYlf8/HY4qYbF38hta3CavJJxZR7p0kcy +wTw== X-Gm-Message-State: ALoCoQnnIggZmZziySXRIJiafkrwGcOXxXulu0cmTmY7OFR+JjorUQeRMSXAdlzqh4xAOJlleG8u X-Received: by 10.180.74.73 with SMTP id r9mr82930524wiv.84.1436477420182; Thu, 09 Jul 2015 14:30:20 -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 j6sm3004128wix.5.2015.07.09.14.30.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Jul 2015 14:30:18 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 05/18] drm/bochs: Don't grab dev->struct_mutex for in mmap offset ioctl Date: Thu, 9 Jul 2015 23:32:37 +0200 Message-Id: <1436477570-4936-6-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1436477570-4936-1-git-send-email-daniel.vetter@ffwll.ch> References: <1436477570-4936-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since David Herrmann's mmap vma manager rework we don't need to grab dev->struct_mutex any more to prevent races when looking up the mmap offset. Drop it and instead don't forget to use the unref_unlocked variant (since the drm core still cares). Signed-off-by: Daniel Vetter Reviewed-by: Thierry Reding --- drivers/gpu/drm/bochs/bochs_mm.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/bochs/bochs_mm.c b/drivers/gpu/drm/bochs/bochs_mm.c index 66286ff518d4..f69e6bf9bb0e 100644 --- a/drivers/gpu/drm/bochs/bochs_mm.c +++ b/drivers/gpu/drm/bochs/bochs_mm.c @@ -454,25 +454,17 @@ int bochs_dumb_mmap_offset(struct drm_file *file, struct drm_device *dev, uint32_t handle, uint64_t *offset) { struct drm_gem_object *obj; - int ret; struct bochs_bo *bo; - mutex_lock(&dev->struct_mutex); obj = drm_gem_object_lookup(dev, file, handle); - if (obj == NULL) { - ret = -ENOENT; - goto out_unlock; - } + if (obj == NULL) + return -ENOENT; bo = gem_to_bochs_bo(obj); *offset = bochs_bo_mmap_offset(bo); - drm_gem_object_unreference(obj); - ret = 0; -out_unlock: - mutex_unlock(&dev->struct_mutex); - return ret; - + drm_gem_object_unreference_unlocked(obj); + return 0; } /* ---------------------------------------------------------------------- */