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 71B80C05027 for ; Fri, 17 Feb 2023 13:48:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1305E6B0072; Fri, 17 Feb 2023 08:48:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0E1596B0073; Fri, 17 Feb 2023 08:48:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EEACB6B007B; Fri, 17 Feb 2023 08:48:48 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id E168D6B0072 for ; Fri, 17 Feb 2023 08:48:48 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id BE68B801A6 for ; Fri, 17 Feb 2023 13:48:48 +0000 (UTC) X-FDA: 80476914336.25.4AAE372 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf19.hostedemail.com (Postfix) with ESMTP id A2C891A000B for ; Fri, 17 Feb 2023 13:48:46 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=C1U29M52; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf19.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=1676641726; 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=qV+blR6Tkr/sKsOr7dEvAgWdCXkrbGqs9gehh/nqNIE=; b=MnoHFHnDQhVLVXeIV9/zunRS5rADHhSbKHosJAIY/grqGCNlBm4Q2E38r/m0DEQBiweA+D rxeODGx/lpmTRmuye7FdFMNbC0FJMVK1Ayu4XbPxbrlkfqUK6ldbrcRKx87ujMiRUqnBxl YwZ1D4JfH0az024u2maBkIf+tNiamDI= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=C1U29M52; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf19.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=1676641726; a=rsa-sha256; cv=none; b=6LV5jbiRF6q6T7i5zZ4Oa8kcS/9K1JJm+7f9PUSA+nVlopQC9HJGOpXHLrhZuu3M+5gTub ZGpijR8MRJjnbifqvz1kFVi0x2ZXFxr/1tIJWJOn7QkahgZ2vlNwvdrBiYixezGW8AglwI F62hs5bD5Oo86m5egGN5Ms0eimPWRlQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676641726; 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=qV+blR6Tkr/sKsOr7dEvAgWdCXkrbGqs9gehh/nqNIE=; b=C1U29M522pGTUT0/O5aAJewBetfkLPq1Tp6k0JX4h0HS4vQeUu3QXAsg1DTnD83NhtJdab CXcsCHgsjAhMkpdNKwpTPD/otKIe33p6j52Fu3nSw5ZJ5i4xWbF2TITi6PUzeVQwcVBLu2 erd9sbu5GysalHoIdOC5ZsM83iCVujY= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-628-fQ8TU7nWNeSSgyGDm_ZJeA-1; Fri, 17 Feb 2023 08:48:43 -0500 X-MC-Unique: fQ8TU7nWNeSSgyGDm_ZJeA-1 Received: by mail-ed1-f69.google.com with SMTP id z17-20020a05640240d100b004acc6cf6322so2013598edb.18 for ; Fri, 17 Feb 2023 05:48:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=qV+blR6Tkr/sKsOr7dEvAgWdCXkrbGqs9gehh/nqNIE=; b=lnZCMHSjAkbEAxQUQqKz3Dw2sZkAqLB/AoxM0V5rArpOHWk4zAUnqFctSO2S1E+weY Pt3mkbZgV9TzuYEjbbqsCM3bT9wNTd0EkUGnU9NuWZBnaRDOMXcYNEqAoUFZX9UomRmx 3dQgPpcdZH/Qal0vE1SeHEwNjkULc+jcyedIZujLe+XVKkgjqo3vyHfq6ZlRHBuX6htN O7RwuqMc5cKAM165KL/p5DA8o7I/6PpIM/VihglHi4jT+0y1NJopvlAYzVgzArkiM++3 dlP53MeaUDaRH2oN3k0JpVL35n9KVvLWCR0msb+9Hk/D8Zsf0OVPjNcuf1RZRMgw6poG zWcg== X-Gm-Message-State: AO0yUKX41VMO1tjj3vG2GEBg67BT/6jhY3cS7gya2gL1Ka6/B9rKyX98 3YwgLN93bGTipw84OzX41AreQB3lgnwik1b4zHzOTHBL8C2pKoBAQ4W4znPHnrqkNi2p85iRa46 V0i8b+7kjM5s= X-Received: by 2002:a05:6402:457:b0:4ad:7640:ff47 with SMTP id p23-20020a056402045700b004ad7640ff47mr3317210edw.13.1676641721927; Fri, 17 Feb 2023 05:48:41 -0800 (PST) X-Google-Smtp-Source: AK7set8TQtlKkchdYFDpX6esHsmxmbuVnZmBvwTb0vwG2PSeRr7Qepshcx1saI0cWGGhV/p6T+nLUA== X-Received: by 2002:a05:6402:457:b0:4ad:7640:ff47 with SMTP id p23-20020a056402045700b004ad7640ff47mr3317181edw.13.1676641721700; Fri, 17 Feb 2023 05:48:41 -0800 (PST) Received: from cassiopeiae.. ([2a02:810d:4b3f:de78:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id v22-20020a509556000000b004a23558f01fsm2348675eda.43.2023.02.17.05.48.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 05:48:40 -0800 (PST) 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 v2 10/16] drm/nouveau: move usercopy helpers to nouveau_drv.h Date: Fri, 17 Feb 2023 14:48:14 +0100 Message-Id: <20230217134820.14672-5-dakr@redhat.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230217134422.14116-1-dakr@redhat.com> References: <20230217134422.14116-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-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: A2C891A000B X-Stat-Signature: pwij1eg5reuza7orykw5gf6at64j4cne X-HE-Tag: 1676641726-547547 X-HE-Meta: U2FsdGVkX1+Gvj9+3c/q3oc5hGrprUV5Jx0rt8B8umK3Z40Ysp8bJ3gtZ4Fo/+x8n0zgbSNOt051D1lzGpj4lf1G/Vn3iL4/auRQSAyMBY1uv0OoJjrXNeywI39UUmOUivZ+B4ZbN4NFMYChRwIVrF93K37PMoaHhHkt4GSWI5YnuOWDudtns8yoM02KFLuAwmY9xqkaqXu1YubbityUYi+xGMJVD+5DBI9dvv+EgkTCrWXjY2hz8wx+t5fluN+ND3gTy4deOYg7kSYzoanhCzh3M3q/ybEBhqZlNPm3GJ7opTodC0tqwG4yb1zuYGkRJXy2n6ma4pJHuhnBF7QseG72cw++9buMlMSkRdZuKh2e+tsWXZOw6KtGoEflUPreHak2aE7dGIlbiNjNILMrcpYVM2B7pGLFknNshrlq+7pORkqS7jq4BgyGCOYBDS698QTzN2EI6LZ+Qm1EpD7c7rJ6R4Y3KTbPJOq1Iy+ID3Ep9kwY0WaeUFK43/7IvXniAJYDIWWXnrsIF30JocH7SNKOWkXAIPxXwuObIqGq+m4Ly5+bx3wDAImx8tpOfJ2l3wBmeU5dRIHHp9FNG1pv73sHw9YiY1fvN0MgbLv492CN8At28vNPTlakRo7x1Na2SBEuSwUnFU167lAcQL/vK4vosFYUGA34yyvlo9tBzFcgCWNk46tFnVJNdD/J0qs3Slk396761T3Tr+QIArF5RLGApUz1QdHKVMmmnD9Tlf+6rfbu/D8S8oQPGeoPvDGCTHamRqe7S8t1HOMcjXPqxBw7DfUXWs4tjn6Dh9Ng3NLqnHCyPy3Z9QeJdNr/ecuI14CGhRQltvUank+abTTXqE59Exrd9d8c6MWEmibE4oi20VP7ROLSki+tOCsPFaHxMTGIrEgkQcSYndzm0fusZuJTVSbg++Gv82jCTipEWRF1V2j81hWU449oMO1bhYNZJdFTd/prR50CjO1ffLW jgvwR+io /YuyB8QiHyBjKbABw8rKk0hgY9J8GbhhyciLmzU+VdIrFuyEuELCghBIP1c2rphb9vOWdz/K8yUgekgVaGx5d15d9Y0qgTS2+XghKMvep+t2Jkssvr0SaPpDvg+fvech0m2jH32yBQqatKRGX4ruowXKoSmQaPWK/u++FkXPGzUuH2TZYfnuLGK8vrODlDi5W3h2pTu41Tc5EMNNsJVCCRerOyGdIosP71tnvimAsFpmURC83HtgI8JIfDOOIBNDmIK8HQ4d5GHow55o5/KtKI5ruV92CArJhHm2XO2xwN4itqFTNJLUQfs4hi5Si9zXScMH6PK+kMKx1ieghNN9jAezRdMttoFg+vl2gpDf2EsGHgFLzdpmQ6JDIu7frTJhuvfEVOFsSkS2ekPgLxAoYM6AwyUzAO1nBhrwvfFG0xm5hpU8fQgDg83pf3Q== 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.1