From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 14846C77B7A for ; Tue, 6 Jun 2023 22:32:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AC1566B0075; Tue, 6 Jun 2023 18:32:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A5F498E0007; Tue, 6 Jun 2023 18:32:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9005E6B007B; Tue, 6 Jun 2023 18:32:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 7E87E6B0075 for ; Tue, 6 Jun 2023 18:32:17 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 427EBC04C6 for ; Tue, 6 Jun 2023 22:32:17 +0000 (UTC) X-FDA: 80873772714.21.EDDE0C9 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf30.hostedemail.com (Postfix) with ESMTP id 26C8980003 for ; Tue, 6 Jun 2023 22:32:14 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Qth4R6ae; spf=pass (imf30.hostedemail.com: domain of dakr@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dakr@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686090735; a=rsa-sha256; cv=none; b=1ettossMjeSIrNTrav/6tVIc5c98QXvZ9VhNgEZLuZQFmeaIh7cOk9MybSlIZ5Lpe7KTnK WFTCmuZUP6GxoCZMVeQNbPlZAUR6pJ1Na0v8ZPtfpeg+5Bv8m/6lGM42G73Opy8eGYzlHw +38Nc4FN0RSO6877DN8r9KrKkUtQOaA= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Qth4R6ae; spf=pass (imf30.hostedemail.com: domain of dakr@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dakr@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686090735; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=15bsZMHgn8HdtpEj/sQfVUEhkE1KgujwGvKHw17TRpw=; b=krvVj93dDREA+TRQgnbGQ/cTjFrm54rZT+fyYY2j5KadGwLjCMaIdV32GUukmlk6ke/ncs eCzT/l7QN3c0EKPOqnKj/BWGK3qdt0gY2opOhiIaRKOcUxU2gjwVzyJrsgVvZdYVQvylU0 Z4u1/L+Zd7mQEmFkh5xBN1Z/8QQvchk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686090734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=15bsZMHgn8HdtpEj/sQfVUEhkE1KgujwGvKHw17TRpw=; b=Qth4R6aeIdVPsrFzjtmMSuxtoqvS7FWGD2bt35nP1WpBYeJreQibSwtCc0GZuGZQu6qpnW uawSApk3+NysYs7OY0GLDrCbfXLudOD7QFPCLZGp/895qhCRGAodJq61ldglfyK128LoAa KoXi7U6M7JNfrtph9SYoCfGtqOCAMuk= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-139-ElOuk9dUM2mh2VqDRRTyQQ-1; Tue, 06 Jun 2023 18:32:13 -0400 X-MC-Unique: ElOuk9dUM2mh2VqDRRTyQQ-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-94a35b0d4ceso492382366b.3 for ; Tue, 06 Jun 2023 15:32:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686090732; x=1688682732; 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=15bsZMHgn8HdtpEj/sQfVUEhkE1KgujwGvKHw17TRpw=; b=TinQkN6Be547V4niUI7HNAehIbHo+uAqX+Qs9uX27C2s5Mj85djG40EvNCJ0XdKThO 9H04OML9mqWoj6UVK6LFMILXyBw5RpqLvyu0TJbaQM+55bCzoUbS9xYoxZ9M1Wb+JMko vd5bBO2HTMQLxqzzGTE+eZHumF0HyNps9Y66VveOgQ110RyUCC/DyXqWlAXsoGrhzXQq FeJHqjb7QmGAlSeL0QHmrX90p1ASqqqhBiyi0YzWKhGvVlkLzaUwgGFKjKW3nn21qsz6 ILcbQkTO4wr/yd6oGM7onHhmFiYV67KLb3Uz4/Cn8CgwL/BuUQXdaLIPeY5iPXYl/zL0 xzcA== X-Gm-Message-State: AC+VfDwlbkZGrT/t8ioQqFiVnacr5bJhmvw+xLqnbGodhm6rblOf/tH2 5x95o4M5SB7izK6Pev+CT3HqUn/fw0v/gIKm3ohJ8O/FnUCHFCnKGl+sGckFBUIH3h011+s/uRp EqeHePNuVHMk= X-Received: by 2002:a17:907:16a2:b0:971:eb29:a082 with SMTP id hc34-20020a17090716a200b00971eb29a082mr4378741ejc.49.1686090731975; Tue, 06 Jun 2023 15:32:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ77wuF5laRMd8UauVtSJvlbhuOhAjTpsroGVkxnZ20HQdV9jjMT18xE+CzMmaMjweOX7gL+XQ== X-Received: by 2002:a17:907:16a2:b0:971:eb29:a082 with SMTP id hc34-20020a17090716a200b00971eb29a082mr4378734ejc.49.1686090731833; Tue, 06 Jun 2023 15:32:11 -0700 (PDT) Received: from cassiopeiae.. ([2a02:810d:4b3f:de9c:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id r9-20020a1709062cc900b009787062d21csm1186055ejr.77.2023.06.06.15.32.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jun 2023 15:32:11 -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 Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH drm-next v4 08/14] drm/nouveau: move usercopy helpers to nouveau_drv.h Date: Wed, 7 Jun 2023 00:31:24 +0200 Message-Id: <20230606223130.6132-9-dakr@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230606223130.6132-1-dakr@redhat.com> References: <20230606223130.6132-1-dakr@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 26C8980003 X-Stat-Signature: m9xqtkp7y7oswbkj4nrs5dz6kbo4n7z9 X-Rspam-User: X-HE-Tag: 1686090734-353511 X-HE-Meta: U2FsdGVkX1+ZAGCkM11AQRNvzXoYLXU5TipL42Rn4R13+9km0JcakznWK2l87RgwkedK+whl154gEPb/0VcGOGisNT7urpHEnfmjuFojqngjZ4X4aTfhrMlP5+4rT4k3Ah54BpWaEjHDSf7y8gZKOVYQPYImmFGxGz78fXoC97RqxBxL6RMVFWbErlGtBYPAie6a5KKte2sDRZg8hGv8e6SYa4U9ZEexGu5Zx0SyYZBZCsJTA5BDBxHXyS3YtYERobHbCrUiqMMUNGSpXswzl7k2OEX2OXTrVBR8YdNd7rUsaxItvmiPdWFkv3Uu2pggNGQUOGCyn/p8w1rUsnaIZR2Mrw4uj6NXlUFCj8RpdaUdwDWxSxfaPqeTg53ayeQSiax+0KZ09UNy8VQduNCvtBQIzDrK710Dk2QK9uYutpTCVvvoVn4gVYluzJ9Oz5minN/iY4NhnsqueGGgZ0/e3uizQYq5U+tRT6pJwVWB2I14MIEhrhD0SumyczNAgsx/fCUB36xHY/nDl8tr0DzqHtPHHk9CTm/yOC3FdrdvwFsaXTXrlGGvn650gD9zkrCt7f0jXBHHLqqWvNArhRXPRb13cbnt9KhbgCMPiwyTp7fAYDC16SeNHx/IBtXIexn8V6u3VbrfKabe1Vv50c3HzJiwEWTU3JHmpbKma9VB/FR/7abZN9jF3MJJcgU3SNAo8a9ArcpBJ/bMpsNiHncCe61vwWy58xfmmS7zuggw7iDdIXD3NLw5TpurjkfUVIt2QLzhByXeLKOLxm9xdnuHxrsfOppSYoYCtYo9Dz/tLA/8ne+4OV3J/q3GLMSq7vGuwxgsNHNptAeXg67wjRMEXQSZXfR+tx4l/m3nxjYmAqxKAeWumqPdSAATkohdmSvgIIpjbcJeHQ4ngKnhBvVETL3xrp6w+EBK0iPmgdlqPqUQU2GH+IWSZAaBgrJrkK5ELWbqj2/s/Sg4drwAuYA Pii3LuGl oIc+ySsAuIQZp0Ufd6hBFc9+6QUsb6nrkku+JJ86WyhVD4jE0kZMnAT/dMgAqGk0jsC1b421FP+eeIY8m5bmM8MXZVvgj7c2USfJ2emaBh7mg46dX9YUvUF3s2z4Kp3h+qB69Fu/qYxeHyFMHAwj1x21jpWdIsgnzW2WQuuG/BJGVUQmIulR6QIl62x8LBTpRcgMc9R6Nj8EZ99NiPhI5ei3rP9XtAqiq3JwHzV/Zl/lhUDg80DS7D8MU1Jc/QqkuL9krE2VGBW4eBg5oFT/1BQLT0U73m9FPdJ1rZJyVQ9y+le/VhFTnJ51nDiKpxmI2nJjVJyENIFDie4mF7hJzA0o2qb0NUHu3s3NvXhOyD4inaYs18FgwIgURyNXj1YosK66RaJfV/AvSS4WJtSaB/oFdh45WPjCJcn4Jj+1Jc6QelNkNJDdglPWWgYn2usHpq7DF X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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, -- 2.40.1