From nobody Thu Aug 18 09:10:14 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M7fHC2bHGz4YwrY; Thu, 18 Aug 2022 09:10:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M7fHC1QFtz3QLP; Thu, 18 Aug 2022 09:10:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660813815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M35hPM34y1NBFUFcUvZvHXXvZd88z021A49x3ILmWs4=; b=Tb3uwzrYusxuvgxWQZ5WcQpUowpSwM3TdAX9tTNcUKXIqgivsTRnizsS5aJC53GG2VfGwO 8eFtTvEAyBPUEqsnbywGPq6ydUrbOygcQgoIMrWrtk5QJNeJcSlbMxKdLHxZAkjabnmLLp cOYFJmiU+gy4In2SlVLa3/v2nuYDH8bGzd9mYAfjI1YYXxRJ7szGkKbQn815bkOwrCUO5z SQy/ajpveVXNQ3OI0lz2bQ1iXsDBjITsmpnSZxhMilIKTse/TmRyt5q4QI71/xQp08zH5X AH/YCxKkN/gO2yrRVfWJ3sOMP5Ta1DprZ1WGoOdOXAyQAjX0it8pdL8x6WKK9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M7fHC0Wrkz1Mkm; Thu, 18 Aug 2022 09:10:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27I9AEvi019902; Thu, 18 Aug 2022 09:10:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27I9AEX6019895; Thu, 18 Aug 2022 09:10:14 GMT (envelope-from git) Date: Thu, 18 Aug 2022 09:10:14 GMT Message-Id: <202208180910.27I9AEX6019895@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 76d93395c522 - main - linuxkpi: Add __copy_to_user_inatomic and __copy_from_user_inatomic List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76d93395c522e28cfa329ba57ca235929462412c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660813815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M35hPM34y1NBFUFcUvZvHXXvZd88z021A49x3ILmWs4=; b=GE2YZAaq6Bfe4ZZxJlOy3Kvb6DJ6LY6x118r4J0EYnDAPgA8AKPi5gHNAnpDsUIjGDmes2 dst2NNyaY6eFIbMd9YuU6xArLlwZdWhoij8gcn+CoubcOUqjzb3P5CWPMWdFgGZv8Po0G7 BILODJ3KYez3ykXKVVNNufOwU5AjNhGYke7WtOuqz68/2EYMFAu+rrt4XdEVY4PgP1AmaX KFPOY9oTyJDnsmyFTDevIZDiaREXpMpna4sUzEpa9Y4RD/DCpkCoVdb65pq1DWQumDO07U FrmE4Z3Vh2FrZMSv/LkSyMZHdNHQloFpLIwb3pbJYVJQv6+aFcFpAGfXCSnbuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660813815; a=rsa-sha256; cv=none; b=Oj2Cwi5PWbGesVjvPQ1nZq2lp3Un92vqjRKbmjwMLC5AUIHMPD448q1c3JjiC6ra8vaF5S c6PPbkEdl+ZQ3M6/w03v2u97MunHUPrRiU5ffSl8k76+Y2D6DeZYXjGYa7t+KZtK72LL3V RvfTTWtbx0PC8IPQfN+rsCgqeQisujSDsX2xjs9+Xvs7lIsI+vqJI8beW3W21AB+NkjJmR crdeMyZ1Z7J4QdORxFCAd1iMnMm8H6WVdO8Mu7+vt02QNSYXb3cxwFiUTcj2aX2gRD+Bj3 Q2VF35Is15dt5DccC7A0r4ASF3OFNJPOrUkG5QGsdG+WxWKC/uZ9KX3tQXn14Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=76d93395c522e28cfa329ba57ca235929462412c commit 76d93395c522e28cfa329ba57ca235929462412c Author: Emmanuel Vadot AuthorDate: 2022-08-10 06:44:14 +0000 Commit: Emmanuel Vadot CommitDate: 2022-08-18 07:47:04 +0000 linuxkpi: Add __copy_to_user_inatomic and __copy_from_user_inatomic Reviewed by: bz Obtained from: drm-kmod Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D36113 --- sys/compat/linuxkpi/common/include/linux/uaccess.h | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/uaccess.h b/sys/compat/linuxkpi/common/include/linux/uaccess.h index c62a94e8e044..3fa16dbcd261 100644 --- a/sys/compat/linuxkpi/common/include/linux/uaccess.h +++ b/sys/compat/linuxkpi/common/include/linux/uaccess.h @@ -89,4 +89,29 @@ pagefault_disabled(void) return ((curthread->td_pflags & TDP_NOFAULTING) != 0); } +static inline int +__copy_to_user_inatomic(void __user *to, const void *from, unsigned n) +{ + + return (copyout_nofault(from, to, n) != 0 ? n : 0); +} +#define __copy_to_user_inatomic_nocache(to, from, n) \ + __copy_to_user_inatomic((to), (from), (n)) + +static inline unsigned long +__copy_from_user_inatomic(void *to, const void __user *from, + unsigned long n) +{ + /* + * XXXKIB. Equivalent Linux function is implemented using + * MOVNTI for aligned moves. For unaligned head and tail, + * normal move is performed. As such, it is not incorrect, if + * only somewhat slower, to use normal copyin. All uses + * except shmem_pwrite_fast() have the destination mapped WC. + */ + return ((copyin_nofault(__DECONST(void *, from), to, n) != 0 ? n : 0)); +} +#define __copy_from_user_inatomic_nocache(to, from, n) \ + __copy_from_user_inatomic((to), (from), (n)) + #endif /* _LINUXKPI_LINUX_UACCESS_H_ */