From patchwork Tue Jun 20 00:42:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 13285079 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 5BC7DEB64D9 for ; Tue, 20 Jun 2023 00:43:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F1C5C8D000B; Mon, 19 Jun 2023 20:43:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ECDF08D0001; Mon, 19 Jun 2023 20:43:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D94CF8D000B; Mon, 19 Jun 2023 20:43:09 -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 CB0AC8D0001 for ; Mon, 19 Jun 2023 20:43:09 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id A78831C7DAA for ; Tue, 20 Jun 2023 00:43:09 +0000 (UTC) X-FDA: 80921276898.01.99E9D95 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf20.hostedemail.com (Postfix) with ESMTP id 89D7E1C001B for ; Tue, 20 Jun 2023 00:43:07 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Ly2D6OAW; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf20.hostedemail.com: domain of dakr@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dakr@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687221787; a=rsa-sha256; cv=none; b=3ISHd3/pXgtM1FQGfkbFBfnXDLwqsBlJeai7V7QJqpIH6IKDoDujYitMN9+9BOYq2zl9ux 6HUIe/pXM64vdcsMxm5srnUrzbsHLNOt2gg+h4BQ1tJqBs9a9ZJJgRunkOE2emuLgljzr/ 29aZXP2gfAQzZhDYzt3UESZK/nni2qo= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Ly2D6OAW; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf20.hostedemail.com: domain of dakr@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dakr@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687221787; 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=AkEgJpdC/ib5/v5Qmh4/qRIVl2xWiD9VH1LD3QvBnGFOPIhO2WixNTp8pf5MqkqxFDFqyL DbyXgqEUkTGg8Jl2oAQ8o2KgYEC+QQocbgs4f0nEsMh1JWRr+SNNCqZLpCKk2a/a4gTfFH tjdv36CmUt2qrRrYTSTrdfQXPb77Ywk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687221786; 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=Ly2D6OAWTJK9WyIHJLsbP5ktgH63XoZrYl1R0gq7Kr0hnVIQgMqxSGzDLmk+4OkFlbAT/D XNk/heK0Xtwn5OkZUFlz+2isVmtVetO4zitb+U28pHGIEfHcprB+7bh3k2i7MrNpcxTi4m vVHUDwKxU9wV9FVGTquIO6KFQ6zKtic= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-500-pTpPQrrvOJKx5quS7x92jg-1; Mon, 19 Jun 2023 20:43:05 -0400 X-MC-Unique: pTpPQrrvOJKx5quS7x92jg-1 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-51a4a83d597so1753170a12.2 for ; Mon, 19 Jun 2023 17:43:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687221784; x=1689813784; 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=DZ+oLJiP4kwfVgy3CUmyX/WLKlJNOD8I5rXw0k6/1HfLmtrGTCfbkTSkSkkVk+0YO8 LcjJtDUFkjgGrKrzHnbJF7F0cTMbym4s4/5kuh3inrCbKyxnelGneFb/RnkvTTutTgdD N+SYhl4q4O4H+dIS7kWc7FSOsXTkNCgxQz/OJ031r73T3bp1gXJN9IKHOufaKIFk/IjB t7RmRBCaZz0nFIp/SWOQLkXWABLDIqaDCRbUZYfavFr1MrclB2MjqPdyRECSrDIzBzQW o5DLY2Zdbac/s88TZkuNfeIrivRtNq2Vv7smaviR8hLb+7GmU6wYgjMzXSgNjTa4QKf4 SIUA== X-Gm-Message-State: AC+VfDzLOelvydevtH8HY+ugPL1q0brevs80Eta0F03cWQYi5z8YQc9f YWdUPE3Or2Rc73bAeTCIL6a5PktnCOPyJYZgng0sc7ob6XGh8IDMXZL8Iz7J08chA2f8ZvrCR9N 3A+UNoPiXkmU= X-Received: by 2002:a17:907:94c6:b0:97a:588f:766 with SMTP id dn6-20020a17090794c600b0097a588f0766mr10489577ejc.42.1687221784469; Mon, 19 Jun 2023 17:43:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7c9FPA9PfjnZ4NBX+L5X8JmjHfzdjLxD7tdsztb6oh+Z4IO34dObfIqPL2WWN4l2JkXpNgzg== X-Received: by 2002:a17:907:94c6:b0:97a:588f:766 with SMTP id dn6-20020a17090794c600b0097a588f0766mr10489556ejc.42.1687221784330; Mon, 19 Jun 2023 17:43:04 -0700 (PDT) Received: from cassiopeiae.. ([2a02:810d:4b3f:de9c:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id me16-20020a170906aed000b0098669cc16b2sm389552ejb.83.2023.06.19.17.43.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 17:43: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 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 v5 08/14] drm/nouveau: move usercopy helpers to nouveau_drv.h Date: Tue, 20 Jun 2023 02:42:11 +0200 Message-Id: <20230620004217.4700-9-dakr@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230620004217.4700-1-dakr@redhat.com> References: <20230620004217.4700-1-dakr@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 89D7E1C001B X-Stat-Signature: dnky5ufqmwyfdxyrc4eo86s4wmuu5pun X-HE-Tag: 1687221787-69571 X-HE-Meta: U2FsdGVkX1/KVJQ3sHcGyWlYnSNrMRNAYhDa8Oa1B/kn1ziNE2HjZNd4g1i+24KBEykwxVBvXMXgkG9F4vCYwMG57X/4cCXyxALA16KmLLeM4HRa9v1wwDRl7tRyK/T4grc2ZhFPW6HnJuerRQ0pHFSDHFYdgL7WSimAAC8a+egTD14xCVYbObw84AKNYoCq90aen6v1BAbTpgBbCy5zIBq3loShQU9pvDTujl4XOgumvJX5Fhr3mlCY+K06mwKNIeE1UkA8iSDW5x17KhDBuegz6fH9dAYR+VLCb417UL5yOMOFCAeK0+uOy9ALkky2E6hcSy4OexGCYAP1eOTMoCkP/TLcgBdki/UflRkVGsd0u/9s9mFU4dMb3deN0K7vaZNxtKDosXLtJ8SHQ1IOSXQ+wOmFqHQ8mcEMi2A+hT7QpC2qV4hSxjrMMfO9XLwlQdzpWbHAA6KripwNLA5cWjlMKAl6RNPWR7vghNa5fWpAqMnM2Onx4DzJpHlH16sbAMVcsdyAMBukJXATP3rDQwoMR+X1GHAw4Ejrdqao6NSI8VaIuPDBIHv4QeZy3qfO+Z4z/GLjmvK8LPZip4lAXf+47h+7PR63/QSfCyRwqfoWwYxy6Dj7OpwsXX5WIycsmfvx00XlG2MUbrELd9+Oz2HI0DFrJnz442E5el6hI8KgWwvtfkzXBjeYe2haQ6kTmaFRrTvPTW+KFUS2ZhDR2KbufpuO34R+q65twyHuMmkKmDsuTpilLiK09unmVYBYZyFpogqXE+4mEDWGs+EU07ObT7gUccOmfBiqPSSFD9hNIPj7XkgSbEA4qNVU+ZzxUDnjR+H4JmV640/GuyyDf9oqAUg/5EkRhgXH2kBLrZnFD+XC1q9Q3MD7tEIid5yNnyp3FhKx2foc4JBKsDHQwurlzf6cCHHdOGAGBjgxj9o5zCRh7lI+6e191Js8hyLrqVTzMJ/yzmy2V/Waobb GdY7/Xvr k6FJYIa4EBlM6Lg12Rj8nXXIk/+CH8R93S5Wz4x451jS8qIT/p6Mn7dupgclx95tmN3jQzbF5x4KapIlXwb98XeMszwvzrTUxpmuwptpd8mtO76imBuMtAhVFkbhqJeBbUzx1n/3N6WROiXn1YjPMzaA1lMWSFaLJTIyhaZWfFn8wzyOLjsxc6tY6InyoRY05GGsiNyL786SHuRmOEi2Vdtm0ALKCR2kDomJhGjOLDWVRytnTspcSky9gvUzkj0KC1rRDYogJaFM2zBFbfYw6eTXfb/S6EzGUoiv8YbzOJYspzwDvL28N6vN/9vZG1gZe3dfQ5tWHqhUX+dH0nl40Fsy23F4A4Xoer4BuRbIp/Blm0mRufw99A9+wwnD2bFvyVIKKtJAoMQXk2zTjHbgxE9Yw8GZh3ciUeBONyVs9IoShZQXeIJFh6/Pscs9l8L7S2FVN 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,