From patchwork Fri Sep 30 13:59:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9358313 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 57DAD600C8 for ; Fri, 30 Sep 2016 14:00:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48F6D2A045 for ; Fri, 30 Sep 2016 14:00:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D6712A04A; Fri, 30 Sep 2016 14:00:16 +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=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 45A382A045 for ; Fri, 30 Sep 2016 14:00:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 236186EA3C; Fri, 30 Sep 2016 14:00:08 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@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 896066EA2C; Fri, 30 Sep 2016 14:00:06 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id p197so2125150wmg.1; Fri, 30 Sep 2016 07:00:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NrDP+AMPrVdyh13/O59a+Ml5kOEOxrtVPVuTPvghyOw=; b=SVWX+xRNkDXcpw4WX2p/N6zDKPXK+YouBUJgdthqZWYQPDZDAZFkttVZdNFVWmxFWi HZBSfHigB3pKORN4INrT8VZkQ+hSQVGWqVUStbCATsJv2dCos7ktPlhyGdE9+TnMvzuA SnP6ewyUlccu3sx1Dc8EW0EY1GMCxl3I8Hv1BSfa08N7CNKwe8bUd1E10M8R3Y1W0/vk kUv69uSHQFUjvRVWpB5qwJojMf3KpbqTtgX9UWw3lX+9EPkn5NM/Y/E//zZ9mAMUUCDs Y1/IGxRfoUCZ4pwXtrezAJJ3Axg5YbirIbCnYZNHtB5V4hfw5S6nLO4CMcGCyV4+IRWS oD7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=NrDP+AMPrVdyh13/O59a+Ml5kOEOxrtVPVuTPvghyOw=; b=Alglemkzvl+PjV47qUPJTubW2n6q2s8XJn/Od0Hmxbl7wk6c8Gvv4YglYvYlNfUxk0 mhX2yxKj/FBWuelWrOnq8ps91AYO8ZdahrQ5L1XDxRN9CKg0PzPZYhqy44LmnbmGQOzN OVr1ZzEfarX9FdTfnkisLBVFp1qFGuZUd3p2mvmSaSiYx2IOf6pHa/XmU1p6g2W7MSYh 0jaauLoFZNDUxjsYNl+gN3gQ8ZDn8TXEZjUqLbh59w5fgfteB9zO4k8p+NhvSFVyfL0l crLzBtTqAgzgXxU4wj4XJTtygaOyw/qfG3GNiJbKMeFYhL3lxeD9HvBYv0mj5eTaUBnR KxJQ== X-Gm-Message-State: AA6/9RltPjUk9GnOUyh5vGPBXvMPHgnpe0p+188iez5WYOBIsMJD1Q59/Qj2rD1cheQd/g== X-Received: by 10.28.223.67 with SMTP id w64mr3908404wmg.84.1475244004949; Fri, 30 Sep 2016 07:00:04 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id rk14sm19758928wjb.6.2016.09.30.07.00.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Sep 2016 07:00:04 -0700 (PDT) From: Chris Wilson To: dri-devel@lists.freedesktop.org Subject: [PATCH v3 1/3] drm/prime: Pass the right module owner through to dma_buf_export() Date: Fri, 30 Sep 2016 14:59:57 +0100 Message-Id: <20160930135959.9159-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.9.3 MIME-Version: 1.0 Cc: intel-gfx@lists.freedesktop.org, =?UTF-8?q?Christian=20K=C3=B6nig?= , Petri Latvala , stable@vger.kernel.org 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP dma_buf_export() adds a reference to the owning module to the dmabuf (to prevent the driver from being unloaded whilst a third party still refers to the dmabuf). However, drm_gem_prime_export() was passing its own THIS_MODULE (i.e. drm.ko) rather than the driver. Extract the right owner from the device->fops instead. v2: Use C99 initializers to zero out unset elements of dma_buf_export_info v3: Extract the right module from dev->fops. Testcase: igt/vgem_basic/unload Reported-by: Petri Latvala Signed-off-by: Chris Wilson Cc: Petri Latvala Cc: Christian König Cc: stable@vger.kernel.org Tested-by: Petri Latvala Reviewed-by: Christian König --- drivers/gpu/drm/drm_prime.c | 17 ++++++++++------- include/drm/drmP.h | 3 ++- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index 57201d68cf61..80907b34d857 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -397,14 +397,17 @@ static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = { * using the PRIME helpers. */ struct dma_buf *drm_gem_prime_export(struct drm_device *dev, - struct drm_gem_object *obj, int flags) + struct drm_gem_object *obj, + int flags) { - DEFINE_DMA_BUF_EXPORT_INFO(exp_info); - - exp_info.ops = &drm_gem_prime_dmabuf_ops; - exp_info.size = obj->size; - exp_info.flags = flags; - exp_info.priv = obj; + struct dma_buf_export_info exp_info = { + .exp_name = KBUILD_MODNAME, /* white lie for debug */ + .owner = dev->driver->fops->owner, + .ops = &drm_gem_prime_dmabuf_ops, + .size = obj->size, + .flags = flags, + .priv = obj, + }; if (dev->driver->gem_prime_res_obj) exp_info.resv = dev->driver->gem_prime_res_obj(obj); diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 0e99669159c1..81fcd553edf7 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1012,7 +1012,8 @@ static inline int drm_debugfs_remove_files(const struct drm_info_list *files, #endif extern struct dma_buf *drm_gem_prime_export(struct drm_device *dev, - struct drm_gem_object *obj, int flags); + struct drm_gem_object *obj, + int flags); extern int drm_gem_prime_handle_to_fd(struct drm_device *dev, struct drm_file *file_priv, uint32_t handle, uint32_t flags, int *prime_fd);