From patchwork Fri Sep 27 13:46:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qiang Yu X-Patchwork-Id: 11164539 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 52F9C13BD for ; Fri, 27 Sep 2019 13:47:14 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3B69C217D9 for ; Fri, 27 Sep 2019 13:47:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3B69C217D9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 76BE66E200; Fri, 27 Sep 2019 13:47:13 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) by gabe.freedesktop.org (Postfix) with ESMTPS id 67F216E1B1; Fri, 27 Sep 2019 13:47:12 +0000 (UTC) Received: by mail-pg1-x543.google.com with SMTP id i14so3512370pgt.11; Fri, 27 Sep 2019 06:47:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=uMw4hvbEA4bmRhiVJHopgK1rbXtd+d6CVZ87jV5clvw=; b=hkeHBy3EV+LBHnUqt7HuXD5CItHSl2gCozX8PEk4zCQR7pGQnTOyawnqDn3Wrco0rK +tWAnKusc7/46/im3jX0rZwqn0TkgTqagc2Q3HkazbcY7tfNvK9BFOC9HrIhz/ALR4T5 L8u9UKJBcsHG6NxmjThfVHC5Q95mIjfCacIQMgOa1UB0jt+4O1OTfLC2BM0ale9XLhQA TR8rBxyA9+xnp0AziHsWAbjSe1j5VR5Hti63AxjSzF8NhrVTPxuRkSMmDYLS2bNfChTo mFaaY+hhvk8WevPXTR/gMLgPK1M6xMmXUwcG/wP7zoDWTkwxWgJa98RhocnGTWudnbiR DL3Q== X-Gm-Message-State: APjAAAXu9amOVInCZpQW1noYT0utjtWTYBruCsGD+1c6mw9ivfMWYC10 CNiZjRTb0e3t0A8eTb+3H/mF4I/k0ms= X-Google-Smtp-Source: APXvYqwxX1NHIlpydsiLWEnppsEhB8Tiv67+vug6Fk00CHSVNOIjdWVFLrsE5BiNl4Cganh7qMxSZg== X-Received: by 2002:a63:1521:: with SMTP id v33mr9451481pgl.9.1569592031802; Fri, 27 Sep 2019 06:47:11 -0700 (PDT) Received: from localhost.localdomain (ah.ptr230.ptrcloud.net. [153.122.161.8]) by smtp.gmail.com with ESMTPSA id q71sm5608860pjb.26.2019.09.27.06.47.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2019 06:47:11 -0700 (PDT) From: Qiang Yu To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 2/6] drm/v3d: use drm_gem_objects_lookup_user Date: Fri, 27 Sep 2019 21:46:12 +0800 Message-Id: <20190927134616.21899-3-yuq825@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190927134616.21899-1-yuq825@gmail.com> References: <20190927134616.21899-1-yuq825@gmail.com> X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uMw4hvbEA4bmRhiVJHopgK1rbXtd+d6CVZ87jV5clvw=; b=eVgtNTepYmpBl5CqJv8CXpxkhwJP02Zkps/q0Tnjely0JtPGfnDhDB1T97DwcT4aFK A24m0bUOQw76WhpUSh8XFMUJEMianJnS2lXhptQBi90DerJ4yaOy5CtyLGYJfLYffX3h TmA760wbmLHuCtMZN16AuWrhF5tGSyMMGhKI1hWop3tY6+quufvIrAuVB4ghn3bgFr3o ywA2Fc5a5tNFSXrT8BBXwHAe25bqNzu912Th6/ZEbHwBpaUBa1/GulpV7fABedDij9YC 6Ox8ZTF3hcEp8RP6jgSqga9Zgi0B1dQVlz1n7bxWmk80B1MdH4RczOKlMHpsDmPsxBQJ tTbA== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lima@lists.freedesktop.org, Maxime Ripard , David Airlie , Qiang Yu , Sean Paul MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" v2: use drm_gem_objects_lookup_user instead of drm_gem_objects_lookup. Cc: Eric Anholt Signed-off-by: Qiang Yu Reviewed-by: Steven Price --- drivers/gpu/drm/v3d/v3d_gem.c | 49 +++-------------------------------- 1 file changed, 3 insertions(+), 46 deletions(-) diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c index 4c4b59ae2c81..75a3b448f3fa 100644 --- a/drivers/gpu/drm/v3d/v3d_gem.c +++ b/drivers/gpu/drm/v3d/v3d_gem.c @@ -290,10 +290,6 @@ v3d_lookup_bos(struct drm_device *dev, u64 bo_handles, u32 bo_count) { - u32 *handles; - int ret = 0; - int i; - job->bo_count = bo_count; if (!job->bo_count) { @@ -304,48 +300,9 @@ v3d_lookup_bos(struct drm_device *dev, return -EINVAL; } - job->bo = kvmalloc_array(job->bo_count, - sizeof(struct drm_gem_cma_object *), - GFP_KERNEL | __GFP_ZERO); - if (!job->bo) { - DRM_DEBUG("Failed to allocate validated BO pointers\n"); - return -ENOMEM; - } - - handles = kvmalloc_array(job->bo_count, sizeof(u32), GFP_KERNEL); - if (!handles) { - ret = -ENOMEM; - DRM_DEBUG("Failed to allocate incoming GEM handles\n"); - goto fail; - } - - if (copy_from_user(handles, - (void __user *)(uintptr_t)bo_handles, - job->bo_count * sizeof(u32))) { - ret = -EFAULT; - DRM_DEBUG("Failed to copy in GEM handles\n"); - goto fail; - } - - spin_lock(&file_priv->table_lock); - for (i = 0; i < job->bo_count; i++) { - struct drm_gem_object *bo = idr_find(&file_priv->object_idr, - handles[i]); - if (!bo) { - DRM_DEBUG("Failed to look up GEM BO %d: %d\n", - i, handles[i]); - ret = -ENOENT; - spin_unlock(&file_priv->table_lock); - goto fail; - } - drm_gem_object_get(bo); - job->bo[i] = bo; - } - spin_unlock(&file_priv->table_lock); - -fail: - kvfree(handles); - return ret; + return drm_gem_objects_lookup_user(file_priv, + (void __user *)(uintptr_t)bo_handles, + job->bo_count, &job->bo); } static void