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 0D9AEC76196 for ; Tue, 4 Apr 2023 01:28:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8BB496B007B; Mon, 3 Apr 2023 21:28:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 86BB2900002; Mon, 3 Apr 2023 21:28:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 70C506B007E; Mon, 3 Apr 2023 21:28:28 -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 5E0F86B007B for ; Mon, 3 Apr 2023 21:28:28 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 424D31C5BC2 for ; Tue, 4 Apr 2023 01:28:28 +0000 (UTC) X-FDA: 80641973496.25.757B3A9 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf30.hostedemail.com (Postfix) with ESMTP id 2619880015 for ; Tue, 4 Apr 2023 01:28:26 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=diHzLBFk; spf=pass (imf30.hostedemail.com: domain of dakr@redhat.com designates 170.10.133.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=1680571706; 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=LKPAKixRboWIVKksjdDd3XWLOGimpIv4cn51ku79o4E=; b=bADOLL/sBWXTmGGYnFL+cxdYFiLYIgtCZKFq27HzGwCkuVMRkLHik4BMHyNQBwJo35+XSu 4yspU8YAnTBr6jAuzhoR84+C/9ZgJnhW9pSbmIt2l5PHy6KWbFTRjJRm1mgpeXB/7h/ESy 0ltvJThcziHo4d17y4Sj+Vdo8d1RKQ0= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=diHzLBFk; spf=pass (imf30.hostedemail.com: domain of dakr@redhat.com designates 170.10.133.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=1680571706; a=rsa-sha256; cv=none; b=gs1w/RK2uNcDSp7rvKhxoj8IFlx6K+dg9paQV7NYox60VC24Mq5cDGXlu72ScfMNy4ZLy4 sQBs0tcFdyTJ3Oy1JJOYf8bQMzoRw9KGAAC8yS0ocUaClVsy6vZHdiCu3bjKX6YoexZPDw OzWBlPciu1MWwA0sTIhw314yHMiqk3A= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680571705; 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=LKPAKixRboWIVKksjdDd3XWLOGimpIv4cn51ku79o4E=; b=diHzLBFkrlgMzentXVERU8X7HVZNcqZrZB4DWGF5UVvbW9mn8EKijbUlHcTTNJLVMfQwj8 grWo9MoE+p2pdh8semvItXssUzHwJXc24fE6ls+l1OMxQizufH2IX9hXUf/4PH64W6JyDO Ld+h9LzP0XaG5FOa1ddK5nIbX31LPbo= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-80-9bfS215VMH6Jst8G5EWV2w-1; Mon, 03 Apr 2023 21:28:22 -0400 X-MC-Unique: 9bfS215VMH6Jst8G5EWV2w-1 Received: by mail-ed1-f72.google.com with SMTP id b6-20020a509f06000000b005029d95390aso7116602edf.2 for ; Mon, 03 Apr 2023 18:28:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680571701; 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=LKPAKixRboWIVKksjdDd3XWLOGimpIv4cn51ku79o4E=; b=w6N81XF31eKKG4M2ZN6EJMojfyU3za9+8EOw5LrAr/gi44slFG/PNOSkSQU8TqYd6i LwnIatNP3esNKqfx7DTBy9H7Zkvm1EiMM46rJpl5t/mfrk6h0Y7wRhWC5xvv1qA2fuJn yqqKU5bU/9L3cZuKBAi9beiIRIZBHtjkOrDhPJnzlv3/BONwYOWpuAdGft/nvBTEKC98 9qtEalbtS5278yB0F8tu1n9kQ5hhsDyFN1hfTHiklG+rq6X/POycacpsUeYJp97sFOCB eMZgT1RuH65OOm3sLzuT1yckMG3J4TNg2URfjeWeHzSpU0X5RKmO+M56Z1h6HZp84LmL 0NSA== X-Gm-Message-State: AAQBX9eYLeplYrHY8Q/cX0v7XZdCAJSv7zCHk4bKjvAdQm3bvX3t0R5k fVNVFtVPOuAAUv63cQtBHgI12WK69SADDK7zUavTWoQ8R960H3hZVWYLeTPkgpU+Pi+mmfkmIuI 5j+0hz9U+toU= X-Received: by 2002:a17:906:7c53:b0:8b1:7de3:cfaa with SMTP id g19-20020a1709067c5300b008b17de3cfaamr521662ejp.3.1680571701402; Mon, 03 Apr 2023 18:28:21 -0700 (PDT) X-Google-Smtp-Source: AKy350bKXBvsLQ358FMlkWLT8DWUxHFmzB6npPtP7ouGx4sEp9lwAApjiFx7erZVjm6I+QFHrVymVw== X-Received: by 2002:a17:906:7c53:b0:8b1:7de3:cfaa with SMTP id g19-20020a1709067c5300b008b17de3cfaamr521648ejp.3.1680571701165; Mon, 03 Apr 2023 18:28:21 -0700 (PDT) Received: from cassiopeiae.. ([2a02:810d:4b3f:de78:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id j10-20020a17090643ca00b0092f38a6d082sm5159990ejn.209.2023.04.03.18.28.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Apr 2023 18:28:20 -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 v3 09/15] drm/nouveau: move usercopy helpers to nouveau_drv.h Date: Tue, 4 Apr 2023 03:27:35 +0200 Message-Id: <20230404012741.116502-10-dakr@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230404012741.116502-1-dakr@redhat.com> References: <20230404012741.116502-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-Stat-Signature: nc4oechdqtpe7pg6okfyc4kj6ycxkg5a X-Rspam-User: X-Rspamd-Queue-Id: 2619880015 X-Rspamd-Server: rspam06 X-HE-Tag: 1680571705-910193 X-HE-Meta: U2FsdGVkX1/aHYc+IoUSmX3tTB5GJRhi9dDHuhvAuOjc3RUv+6qpDkKIjdup455TTEtE+IbXouZDvtbz4HYqTzZK33bAheR6FmvOS5RHaA7zLnfFGU5D0G+voN+qnLJK+3Y6ZdqcFtId3gLJE+WvEmHFJjBD5bje6ehdZpxZY8jdCk8gQjijbhYs2tg8gVImtFri4kwR0yfealoAFffejTt3E4ouAD2c73UVbl8/3Vadgzq7Hia8UccgDrQ120MJHrbMLQtWVbf1Z1r9s5VZIE3pSKl8XTN+jx0I+PUwDrMujXSoKABG8Y+oaye4ulU5JBDVbZaT3PzjKRKI4SdE1Eo4ZqbfS2RcN1GBrMhVGU6nMBFp3dva3pPUgLqTxkvXz6/tzQZtncmXSEpST3AO8pRWrNailpXFO0levMBLKlBDSek9YsmWvnvt3jUUBs/uCeEaerjwctpXXFEbFKBz9K6y/BqYOoyk84F/M3CC4Aq9SsNhvlH3Kc6g+zJdjtdnFiw7NcZzvypXhMHAXTLn0YmwvEgQBbY+Kk9BBPbbvAKjBkrSMTMDD0pIsHjDmH8oXCBn2R6wTKRh9pdF90APc7xUfLH4fNYxP/SmMAPWR96GtV8QmXdsV9dZroPP8zB1Kn6+Ohl6tJ27VzXdliO5No4dNUG54FylQpJamHMfvmWz1lPHXR0pp3trFeVJ5mvftpKZ3xImQKOBW0CuVFceAF2JCO/i23pMRfYxBlfhH1+y+QUh/cwEeEhPIJYc/FowLjsiW8K5qu/8KYBq2q7elJ6uFGifDjLu4rYgQoKghXEcaxS1leF12i0DWusEA6Edh4Kl7rJ2+ePc4xa+GeXpQqPlqoxSaGiKP+zEqmgv6l01tp8/Pp5QkLrOkNv5tIOa4/8rHH2iIFVYrCpudnKX5XK48TvRGyUpw/sJ+QBAQb2EfjeyBXagjWpbqJQUP0Qb7fh8acEesZdVKFt1BsF 0SaJx7XD lwhD/w6kAkrmZKHR4kweAh7gWvquOTUVcK8c/9wMR1ochb3Ei/Wgo5rha+3iizLu1Ii+/cNvZ/1T1L4/uFfslh0CskwDRERD4iP+M7qxgPg1Fnya3E4DqPlSN29rY5K1EI0WmIJWP4hmiejKe2SoPzBJx0Sf/xXIx0DtfVoV0LCepa5ITIwF1ilQMWuXRkgLJeqlgmZwkuJPZWv8MamYjE7HEgm1F1gWV6NqNFrfWfvMctbuBZ2EmcCi6QclEDra2ujSCnp9a4FnDgFsJEKpjU5XhtqNXq1VauI822dWxCh+hn0qvfG+VWn0sQdSCD/5/lPpMkfYd1cg9AKgXw0plh33BqEQGhuNl4pXmLJIZbKRLNXokh4RaS0hE1v+Sx0mMwAlbkHeOi0B52BCUdt99mzuJn49JtrWNaLQlnL7o6cEspBPRZm2XJYQEXrapVaKIFmNpT7OZVvdSWtc= 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 08689ced4f6a..4369c8dc8b5b 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.39.2