From nobody Sat Jan 15 00:51:43 2022 X-Original-To: dev-commits-src-all@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 37A291951632; Sat, 15 Jan 2022 00:51:45 +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 4JbKPD1zFqz4kBM; Sat, 15 Jan 2022 00:51:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642207904; 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=q8mqw/0jbEMTF/n2kJamVsLZCm3JBHhwg0qKS5fxA9M=; b=bjcmP96TsftjUtn9BPp3jJl00q0yCpUNo7PlfLBBc9HyxR0sE+It75uvOPPsU//l4+ryJ2 Qk9wpyVuP6O/j35dv0hiMVlNwIje3IJyWdHoYPJ+OoVBUnv5Ksnqdbc5c4ELKEpOq6LK/8 JLHeFs4mWr3klrFWwzLEU8V2huNp2jFHwWmlfcxeooDYh2NbjqnSrLjEbTNFdhmyMwcweO QRnEdD6H9tA80VsqF55oZolB8b9kVro/OWECxmWRa19bpra4HtWUXcd2uqjirVagzXKgva AElR+tERdD8QL76nHBu3sFy2P48V3I6uV1tBxSiTy8lOGyk2WKXCawejrO739g== 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 64C991D6E3; Sat, 15 Jan 2022 00:51:43 +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 20F0phNs031252; Sat, 15 Jan 2022 00:51:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20F0phLM031251; Sat, 15 Jan 2022 00:51:43 GMT (envelope-from git) Date: Sat, 15 Jan 2022 00:51:43 GMT Message-Id: <202201150051.20F0phLM031251@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b4889992d787 - stable/13 - Add vfs_remount_ro() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b4889992d787275e9b67bdff6d08d585e6659cab Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642207904; 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=q8mqw/0jbEMTF/n2kJamVsLZCm3JBHhwg0qKS5fxA9M=; b=TkKEZLU7XShg+mVrNMJSliXwRUrJ9zDkR3N77sOUrvMnwzOPHtCGNsiJ22X4+kLre2Aw8X JMl9jJJQW9sFpFKW6pQuutho5SxF3E1AHSLnvgmrsjQRgT2SyWBrhWHg3DKmhtusgYT5g7 g0M/ispLVLKnaCWQOMWwMbjxBGjfi9vDdhsjXYN3mWQUe5jFc4SCrLLJ3p3xiwtLt92AIp p4jp0EJg5QParaEKqz5bnNcrdcqhyjq2DeiSWKamb1CVp2VrSws4GeSYoHHlM7tDQZKi8a wOFOdB8Sz2MpCHxsJcH4FIMOR6ZT3T/y5Bj+80AhC9fF35alnIni7/zBAdLqgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642207904; a=rsa-sha256; cv=none; b=J4u2sGq9rP0ZzHPozJ7Dt2a5R7A51lVw2Tyy8zZIjb08AQofO/E9GqqBN+EJJulp/xsj5P 76oO6uDIg7rGKE+xNZB192VWJd76wKAZHD9KnB7elgiNaI7tiqfodMKSknwDvqOt9aA6G1 AaGPr/uxWfyLg/RAZyPzcFw7H4Nc3fNt+GA0Ct9UmhNlyDlT5wiCu2/J+IgA9G+DGtX0zj CnWXYFXV5BXqqT1frGsHrqKWAgoxmQRBJhslAHC5EG/NIVKau3DvDrrI6uhqoDBlyMGgDl izeB9QUBI48hkqhdlfpPyTm8fEeM8mohHA+7QZsmeGXoS4yO49oXZ9ZRmibIbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b4889992d787275e9b67bdff6d08d585e6659cab commit b4889992d787275e9b67bdff6d08d585e6659cab Author: Konstantin Belousov AuthorDate: 2021-12-25 19:44:59 +0000 Commit: Konstantin Belousov CommitDate: 2022-01-14 18:11:02 +0000 Add vfs_remount_ro() (cherry picked from commit 4a4b059a97950740f04b091d7050460a984e7555) --- sys/kern/vfs_mount.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++ sys/sys/mount.h | 2 ++ 2 files changed, 91 insertions(+) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index c10c24f4501b..1ecb2b5939d5 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -2557,6 +2557,95 @@ mount_devctl_event(const char *type, struct mount *mp, bool donew) free(buf, M_MOUNT); } +/* + * Force remount specified mount point to read-only. The argument + * must be busied to avoid parallel unmount attempts. + * + * Intended use is to prevent further writes if some metadata + * inconsistency is detected. Note that the function still flushes + * all cached metadata and data for the mount point, which might be + * not always suitable. + */ +int +vfs_remount_ro(struct mount *mp) +{ + struct vfsoptlist *opts; + struct vfsopt *opt; + struct vnode *vp_covered, *rootvp; + int error; + + KASSERT(mp->mnt_lockref > 0, + ("vfs_remount_ro: mp %p is not busied", mp)); + KASSERT((mp->mnt_kern_flag & MNTK_UNMOUNT) == 0, + ("vfs_remount_ro: mp %p is being unmounted (and busy?)", mp)); + + rootvp = NULL; + vp_covered = mp->mnt_vnodecovered; + error = vget(vp_covered, LK_EXCLUSIVE | LK_NOWAIT); + if (error != 0) + return (error); + VI_LOCK(vp_covered); + if ((vp_covered->v_iflag & VI_MOUNT) != 0) { + VI_UNLOCK(vp_covered); + vput(vp_covered); + return (EBUSY); + } + vp_covered->v_iflag |= VI_MOUNT; + VI_UNLOCK(vp_covered); + vfs_op_enter(mp); + vn_seqc_write_begin(vp_covered); + + MNT_ILOCK(mp); + if ((mp->mnt_flag & MNT_RDONLY) != 0) { + MNT_IUNLOCK(mp); + error = EBUSY; + goto out; + } + mp->mnt_flag |= MNT_UPDATE | MNT_FORCE | MNT_RDONLY; + rootvp = vfs_cache_root_clear(mp); + MNT_IUNLOCK(mp); + + opts = malloc(sizeof(struct vfsoptlist), M_MOUNT, M_WAITOK | M_ZERO); + TAILQ_INIT(opts); + opt = malloc(sizeof(struct vfsopt), M_MOUNT, M_WAITOK | M_ZERO); + opt->name = strdup("ro", M_MOUNT); + opt->value = NULL; + TAILQ_INSERT_TAIL(opts, opt, link); + vfs_mergeopts(opts, mp->mnt_opt); + mp->mnt_optnew = opts; + + error = VFS_MOUNT(mp); + + if (error == 0) { + MNT_ILOCK(mp); + mp->mnt_flag &= ~(MNT_UPDATE | MNT_FORCE); + MNT_IUNLOCK(mp); + vfs_deallocate_syncvnode(mp); + if (mp->mnt_opt != NULL) + vfs_freeopts(mp->mnt_opt); + mp->mnt_opt = mp->mnt_optnew; + } else { + MNT_ILOCK(mp); + mp->mnt_flag &= ~(MNT_UPDATE | MNT_FORCE | MNT_RDONLY); + MNT_IUNLOCK(mp); + vfs_freeopts(mp->mnt_optnew); + } + mp->mnt_optnew = NULL; + +out: + vfs_op_exit(mp); + VI_LOCK(vp_covered); + vp_covered->v_iflag &= ~VI_MOUNT; + VI_UNLOCK(vp_covered); + vput(vp_covered); + vn_seqc_write_end(vp_covered); + if (rootvp != NULL) { + vn_seqc_write_end(rootvp); + vrele(rootvp); + } + return (error); +} + /* * Suspend write operations on all local writeable filesystems. Does * full sync of them in the process. diff --git a/sys/sys/mount.h b/sys/sys/mount.h index aa876cdb00e9..93193eb3e28c 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -1004,6 +1004,8 @@ struct mount *vfs_mount_alloc(struct vnode *, struct vfsconf *, const char *, int vfs_suser(struct mount *, struct thread *); void vfs_unbusy(struct mount *); void vfs_unmountall(void); +int vfs_remount_ro(struct mount *mp); + extern TAILQ_HEAD(mntlist, mount) mountlist; /* mounted filesystem list */ extern struct mtx_padalign mountlist_mtx; extern struct nfs_public nfs_pub;