From nobody Sat Mar 05 11:34:23 2022 X-Original-To: dev-commits-src-branches@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 B8DAD19E84EB; Sat, 5 Mar 2022 11:34:25 +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 4K9jL84c8Gz3rfS; Sat, 5 Mar 2022 11:34:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646480064; 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=xI/6/lWG9TJeHf2v3hq6tTamOG44+mbhmkKVE6jsCFM=; b=Zb+x02W6/1loFEGgKv3D/ZW8HymqGA06w55+vH3OXevRhwxFBk0DnRRh5Mvj24ai7VVhfh E/Ba0umsBXI/UluLA49LFCKcepNozQV15NOrV4+Iez21atg8STiHEsjTmsJW+9bBEROHA/ C/WbiFcKVI3IPJFUwliGU41mI4vQQCbd+SegUYClqr1yJmNUMWjyT3E8YegJugPYalPP6n CHYkDF8xkGdTvIBJYhBtbU1XLbZjneMevAoM5XwT/loN+R+iTNgr8EHYVMHXy3NaqofTA/ NiSRg0LurVbqTF1RikEUugANAy+4AV6oaFu59n/CJfJ5yGbdCR+N/x3wNROrnA== 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 D09D21FC01; Sat, 5 Mar 2022 11:34:23 +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 225BYN6F046674; Sat, 5 Mar 2022 11:34:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 225BYNcQ046673; Sat, 5 Mar 2022 11:34:23 GMT (envelope-from git) Date: Sat, 5 Mar 2022 11:34:23 GMT Message-Id: <202203051134.225BYNcQ046673@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 61b0043efb8c - stable/13 - linuxkpi: Add mmap_lock.h List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 61b0043efb8c14aac1db81e5c4254b5b0bacc255 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646480064; 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=xI/6/lWG9TJeHf2v3hq6tTamOG44+mbhmkKVE6jsCFM=; b=ujiLQhknrgQ2TIsyODyiNmzWSkBq50Ff5sIcwIbkPehQaDtyOe7pbEl7fL6ikmUPYxoSmW klcHwnLaVV2Vo7YsD1OthOergZgJ2eQrMfsRDuTuOlvLfFVaUI8rc/bcG4IJOKbs/6aMfL dR2g8c/e/XGZ0Edv/IyuqU5AvhMjVEWB9J0zxHMDfaxh9pkA0jJe8ZoWs4ads58m0vfjJj aCTkaLIzCN+Sricuy/4/KnOc2+9wgoyG1kzWqAYv1WNmi7eUQPm5ssw+Dxqgdk+8sWlwrQ GYRmP7hysu21GuYEAsq0lYtzC2G6gxVHrUeyP+Qx94yLwtirRQwrf+dEXDWjLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646480064; a=rsa-sha256; cv=none; b=Ilx8U3ciLvDGn702y38R0OGt5ws7+F5Pd07vjvTOkIfZwHpF+q3hC3hebcIOiUZjN9f2EX JnYTixzavk8zEqnrNVP0rO2XXQygvX4+bQPxxEgpH0OLIUqihTttCEa6CHCm7985IeTu0R a3W9WEh6I5oiwLBkFt5jU8toMX9sjrQMrG/p37whio40s7L1vNS0KJRhnF2K43+t/WH5wE sjQSb6dXQMDt5EmB35BJSCsx8NCfH7u8uMT22MR8zyfp8JumFKcHCdZY1iJE+s0fz7KG15 7fzhZ73nau4Hk/J94J2d41Rvc8eOyM0YDB9LAc3tQrbaIQPX6Dhr4GHEE1CWaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=61b0043efb8c14aac1db81e5c4254b5b0bacc255 commit 61b0043efb8c14aac1db81e5c4254b5b0bacc255 Author: Emmanuel Vadot AuthorDate: 2022-02-16 10:26:14 +0000 Commit: Emmanuel Vadot CommitDate: 2022-03-05 11:12:44 +0000 linuxkpi: Add mmap_lock.h This contain mmap_read_lock, mmap_read_unlock and mmap_write_lock_killable which are abstraction around down_read, up_read and down_write_killable. Note that in Linux 5.8 mmap_sem was renamed to mmap_lock. We might want to do the same at some point but some drivers still uses the old mmap locking API. Reviewed by: bz MFC after: 2 weeks Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D34297 (cherry picked from commit 995c3b88d485b9b64ab94efe270d424b2526ade7) --- sys/compat/linuxkpi/common/include/linux/mm.h | 1 + .../linuxkpi/common/include/linux/mm_types.h | 1 + .../linuxkpi/common/include/linux/mmap_lock.h | 54 ++++++++++++++++++++++ 3 files changed, 56 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/mm.h b/sys/compat/linuxkpi/common/include/linux/mm.h index b8fa59f8dd5b..4d4c189e2939 100644 --- a/sys/compat/linuxkpi/common/include/linux/mm.h +++ b/sys/compat/linuxkpi/common/include/linux/mm.h @@ -39,6 +39,7 @@ #include #include #include +#include #include diff --git a/sys/compat/linuxkpi/common/include/linux/mm_types.h b/sys/compat/linuxkpi/common/include/linux/mm_types.h index a59c1e535b45..2a7b33d15054 100644 --- a/sys/compat/linuxkpi/common/include/linux/mm_types.h +++ b/sys/compat/linuxkpi/common/include/linux/mm_types.h @@ -45,6 +45,7 @@ struct mm_struct { atomic_t mm_count; atomic_t mm_users; size_t pinned_vm; + /* Renamed to mmap_lock in v5.8 */ struct rw_semaphore mmap_sem; }; diff --git a/sys/compat/linuxkpi/common/include/linux/mmap_lock.h b/sys/compat/linuxkpi/common/include/linux/mmap_lock.h new file mode 100644 index 000000000000..de6b2a029b1f --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/mmap_lock.h @@ -0,0 +1,54 @@ +/*- + * Copyright (c) 2022 Beckhoff Automation GmbH & Co. KG + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +#ifndef _LINUXKPI_LINUX_MMAP_LOCK_H_ +#define _LINUXKPI_LINUX_MMAP_LOCK_H_ + +#include +#include + +static inline void +mmap_read_lock(struct mm_struct *mm) +{ + + down_read(&mm->mmap_sem); +} + +static inline void +mmap_read_unlock(struct mm_struct *mm) +{ + + up_read(&mm->mmap_sem); +} + +static inline void +mmap_write_lock_killable(struct mm_struct *mm) +{ + + down_write_killable(&mm->mmap_sem); +} + +#endif /* _LINUXKPI_LINUX_MMAP_LOCK_H_ */