From patchwork Thu Jul 13 17:04:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 120071 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1979904vqm; Thu, 13 Jul 2023 10:33:42 -0700 (PDT) X-Google-Smtp-Source: APBJJlE4jLBwsx+DjzOcp5wRrbWRF8UfzXPWJpj9DMUS+dKEA26+xTsGloq/uOV+w8fmYv/ifaPe X-Received: by 2002:aa7:cd71:0:b0:51e:2664:e6e7 with SMTP id ca17-20020aa7cd71000000b0051e2664e6e7mr2260592edb.38.1689269622118; Thu, 13 Jul 2023 10:33:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689269622; cv=none; d=google.com; s=arc-20160816; b=0C0qEqz2MpjUF0le5VRBPqSK+ZK2zpc87/13fpwutVJOOCPKKElqRIFUtLoqzE/bZv QaL7Ho0gLTEV0Avn6rVcZYFL4XCOmiMdgxDXPBjDLvB1rN4RpG5/REvAlRKKPz0Zn4L9 VMVJlOrL8/rdx/8rgcFNNeprKiHt42Gtp4gJvNQtpEM7y5MJSqVmc10b3NBiVIcoFKxj vPpk0Uqc2hH/nSBnEeDeUX6vRKXm+GOZk5X468ieZ+JQZNBhwfn2is33X7ZmTDfH83M3 s0Qdt58en+CqFgPaWVPx0ZoNjpRQqJFU8P+JtHxt1neIvQuIADKYJLit29u1n9rwotUh Yi+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=LEv7G0CEYOPGW2iDjZ4bQ7xPP+mjrUkHdLemyMCnVvw=; fh=grh6qrjW0oxu0S8zfHJMhxWLgUXiZ/TU2uoVe6KOi4w=; b=eu6QSkHWa+kDS1U/pwz5j7y5u/OLf7+8URNHYupH6koH3s31hSYE13jqoWCKMkS8kt 8IAayj1Ps39ShpqBp/9tb0g6psER+vImKQZBhcQYLnxYEGaBid86tcqBd0Xjw+5E517h esvVmTmpmsfIMbA45NPzYoI8n5vx7DTh7Bi+hmqu4+iOnMOvtp81lMWQQMCPVaF7UW/T BX8fs9vjP5behNXDvKMaFVRNl/ypPg7bwP5ciTU9c85xAf0Wb7zQeaO5gb5i9pTh57qT XdiNd7V9al3jAm/kzXnGwq3aKS0tLeK5DiUpTqUK80LLfbwXAoDmLHViQpqx+hix9eMl N2Cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=FJ5UULOH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i13-20020aa7dd0d000000b0051df225e708si7797506edv.46.2023.07.13.10.33.11; Thu, 13 Jul 2023 10:33:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=FJ5UULOH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232141AbjGMRGS (ORCPT + 99 others); Thu, 13 Jul 2023 13:06:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230337AbjGMRGO (ORCPT ); Thu, 13 Jul 2023 13:06:14 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 993902D50 for ; Thu, 13 Jul 2023 10:05:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689267906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LEv7G0CEYOPGW2iDjZ4bQ7xPP+mjrUkHdLemyMCnVvw=; b=FJ5UULOH422tP/0ZB/UlTS08v/f5yvx8SY4OCRMZTEeg6E0Qr8f4uxLTP1bhlgXOZ9ZWVt IJ+spYxeLBzEAO2s7a2UNrJIP/ZfVk6ckwrSVqRQj8hnlyaqyibxbFUomCqdIFG/EXy3f9 9zltKQlie+MbtzX0Q+WC8cXFSK/hRhA= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-172-RkPDYurGMHyFfv6kMLC3tA-1; Thu, 13 Jul 2023 13:05:05 -0400 X-MC-Unique: RkPDYurGMHyFfv6kMLC3tA-1 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-3141325af78so663378f8f.3 for ; Thu, 13 Jul 2023 10:05:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689267904; x=1691859904; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LEv7G0CEYOPGW2iDjZ4bQ7xPP+mjrUkHdLemyMCnVvw=; b=IMH8nQlcL06us7qkXZV9mcGB0+ROoCYf3F/iT9PbQKX9s4WAbHnz4LbyAQ/gwpR8IB NoMvf60IgpT5Hnpf7D9z2CzPuynoGi4ahq8lH77lHisJq6ItC4ZpcncL2J6pYIsc6fbn +WAAJJdnwwiqVbOsifHjiHD4rFNv8LMT9V+LjjapNDhesgaNtrgoxdOA0RfjrwQ+4g1J 8YJdJXfqE0GekKeKKBrItVw5lDmKkQMFW+C41YLOQ/NeexsgBmi/ksSFgiQ7cdcpWFrv I3xdo/y7rqCWZFf5/OXdb2H1WfpMC4Ld6nRG+Jskot+/dCV9RzX8i1JpNhlRXBNGhGK5 DmWQ== X-Gm-Message-State: ABy/qLbg6U4+xOutjMD3bITgv+K4u4qd3zmU6Dn90OevYuXl2kWgt2c9 q6NR7T3C3pAj0x/nf+RYQSr4zmGeJMxjHUebUaEIy8N+V+jct7JYD2/xWQFI34K4dXru1UL0ANY GO6rJlhfPXi6unWKQi6s0GrOD X-Received: by 2002:a5d:500f:0:b0:314:37a:4d2 with SMTP id e15-20020a5d500f000000b00314037a04d2mr1881504wrt.60.1689267904130; Thu, 13 Jul 2023 10:05:04 -0700 (PDT) X-Received: by 2002:a5d:500f:0:b0:314:37a:4d2 with SMTP id e15-20020a5d500f000000b00314037a04d2mr1881473wrt.60.1689267903898; Thu, 13 Jul 2023 10:05:03 -0700 (PDT) Received: from cassiopeiae.. ([2a02:810d:4b3f:de9c:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id r11-20020a1709067fcb00b009929d998abcsm4194749ejs.209.2023.07.13.10.05.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jul 2023 10:05:03 -0700 (PDT) From: Danilo Krummrich To: airlied@gmail.com, daniel@ffwll.ch, tzimmermann@suse.de, mripard@kernel.org, corbet@lwn.net, christian.koenig@amd.com, bskeggs@redhat.com, Liam.Howlett@oracle.com, matthew.brost@intel.com, boris.brezillon@collabora.com, alexdeucher@gmail.com, ogabbay@kernel.org, bagasdotme@gmail.com, willy@infradead.org, jason@jlekstrand.net, donald.robson@imgtec.com Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH drm-next v7 07/13] drm/nouveau: move usercopy helpers to nouveau_drv.h Date: Thu, 13 Jul 2023 19:04:02 +0200 Message-ID: <20230713170429.2964-8-dakr@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230713170429.2964-1-dakr@redhat.com> References: <20230713170429.2964-1-dakr@redhat.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771327582937589778 X-GMAIL-MSGID: 1771327582937589778 Move the usercopy helpers to a common driver header file to make it usable for the new API added in subsequent commits. Signed-off-by: Danilo Krummrich --- drivers/gpu/drm/nouveau/nouveau_drv.h | 26 ++++++++++++++++++++++++++ drivers/gpu/drm/nouveau/nouveau_gem.c | 26 -------------------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index 81350e685b50..20a7f31b9082 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -130,6 +130,32 @@ nouveau_cli(struct drm_file *fpriv) return fpriv ? fpriv->driver_priv : NULL; } +static inline void +u_free(void *addr) +{ + kvfree(addr); +} + +static inline void * +u_memcpya(uint64_t user, unsigned nmemb, unsigned size) +{ + void *mem; + void __user *userptr = (void __force __user *)(uintptr_t)user; + + size *= nmemb; + + mem = kvmalloc(size, GFP_KERNEL); + if (!mem) + return ERR_PTR(-ENOMEM); + + if (copy_from_user(mem, userptr, size)) { + u_free(mem); + return ERR_PTR(-EFAULT); + } + + return mem; +} + #include #include diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c index 45ca4eb98f54..a48f42aaeab9 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c @@ -613,32 +613,6 @@ nouveau_gem_pushbuf_validate(struct nouveau_channel *chan, return 0; } -static inline void -u_free(void *addr) -{ - kvfree(addr); -} - -static inline void * -u_memcpya(uint64_t user, unsigned nmemb, unsigned size) -{ - void *mem; - void __user *userptr = (void __force __user *)(uintptr_t)user; - - size *= nmemb; - - mem = kvmalloc(size, GFP_KERNEL); - if (!mem) - return ERR_PTR(-ENOMEM); - - if (copy_from_user(mem, userptr, size)) { - u_free(mem); - return ERR_PTR(-EFAULT); - } - - return mem; -} - static int nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli, struct drm_nouveau_gem_pushbuf *req,