From nobody Fri Jan 20 03:23:49 2023 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 4NylFy1GhSz30vhF; Fri, 20 Jan 2023 03:23:50 +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 4NylFy05mDz3ntr; Fri, 20 Jan 2023 03:23:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674185030; 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=fqkylt0UCXSrPeMccBsHoxpAYhIxWf/sswjfEPH0K7c=; b=bpw4YBpw5MpAWsWrxnMJ2Ind+CyFmeEnzhDzeL/NUklKNBCcRuMHNOBAbdOdb7yAjrmmW/ 1j2fjUAF2pKHZureN8ywVyR4ZKLSyd2i7gf1JzSWDZe4TlUQgxlONoUxQxVSupCZjCz+u2 eYd9M4W6mf/VQT7ozkNrtD5tRZYBsVqtFo+NBS3uxEQc8nilqp7wBf2tvu05gFlLWGgvc9 IR1K5EQBAQzNl1BD6Hdpstef6N0a8MFIzLAt8TWYm5aPP8VLNzVMbgMcWpWWndgYirMXkD Qr0i2MNC8AM7ytBqs+JphOwGgfVR0owxXoCtndhg4YsLrooTRu7cUOLU9LGL5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674185030; 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=fqkylt0UCXSrPeMccBsHoxpAYhIxWf/sswjfEPH0K7c=; b=YLM5r6qPcMdPbMowTZ2X3OrvVIacet0EJlQr3IdwJCBD0deAeBijhRvnzlSEAYSZ9sKNMm fx2ZQq8Z5RtGP9WotMrxW9dc242KGKoliyE1fd75UiiAmB/wL49YAUTajXGRCz6KhneMxe Gtp4KmQVT9zxpmoBkbDsah84yhuf5OysfhisAWb5gtXWzplDvp2/6YtKH8JqFAoQ3BByT9 15b3yQL+ZZ9q1hth96nlHmlnCuH0+/e6rOzYazvZdz4Y3R45MMgyfenCuoV6hE0t2bnsSs Qx14wJP/rGbErDj5eA7ay7OrK9vs0v0r3v61HwROf83Nw7KEfRFPLNA7ND0mDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674185030; a=rsa-sha256; cv=none; b=C/dsfK7djVbCsxIEO+kxIjC9G8nNFynD0CbBIXpzQvSEYvkgcTRC4IkDYSVNoXYPqT5YTP zOCyM7i62lC9azQWH/Bq0+rTzXFiZbY19MwAE/EkufgY5b1EE5Mg5rYIOca9+JZQnTr/YZ qMzM5df6TaefmxIh6+7aHf4NVyUntIsqJl8eLxebVFuUtQxDAEFpwss4jEty/3uPfXBnqE X5kmKszadbnXqunQ3pK6Gw/JQUjcQO+MnOB8BsahSj8TX4YcsIt+Qzg0w3q08IAw1zlDNh AQZxTGeU5DA2wU+Z3xbBoZazbkgHrMHw/Sq28aoOva0dC+NaZcG3/vHX6q+NzQ== 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 4NylFx5ppPzGKg; Fri, 20 Jan 2023 03:23:49 +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 30K3Nncv042692; Fri, 20 Jan 2023 03:23:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30K3NnkX042691; Fri, 20 Jan 2023 03:23:49 GMT (envelope-from git) Date: Fri, 20 Jan 2023 03:23:49 GMT Message-Id: <202301200323.30K3NnkX042691@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: e1d9d8fe64ee - stable/13 - Add descrip_check_write_mp() helper 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e1d9d8fe64ee94f78d679235bb76b2a01068b4b2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e1d9d8fe64ee94f78d679235bb76b2a01068b4b2 commit e1d9d8fe64ee94f78d679235bb76b2a01068b4b2 Author: Konstantin Belousov AuthorDate: 2022-12-28 18:13:01 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-20 03:21:23 +0000 Add descrip_check_write_mp() helper Tested by: pho (cherry picked from commit 37b9fb169686e867987c8a1a9868f81137b9df2b) --- sys/kern/kern_descrip.c | 25 +++++++++++++++++++++++++ sys/sys/filedesc.h | 2 ++ 2 files changed, 27 insertions(+) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index ff999cc82f97..6b2d95d53db0 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -4238,6 +4238,31 @@ mountcheckdirs(struct vnode *olddp, struct vnode *newdp) vrele(olddp); } +int +descrip_check_write_mp(struct filedesc *fdp, struct mount *mp) +{ + struct file *fp; + struct vnode *vp; + int error, i, lastfile; + + error = 0; + FILEDESC_SLOCK(fdp); + lastfile = fdlastfile(fdp); + for (i = 0; i <= lastfile; i++) { + fp = fdp->fd_ofiles[i].fde_file; + if (fp->f_type != DTYPE_VNODE || + (atomic_load_int(&fp->f_flag) & FWRITE) == 0) + continue; + vp = fp->f_vnode; + if (vp->v_mount == mp) { + error = EDEADLK; + break; + } + } + FILEDESC_SUNLOCK(fdp); + return (error); +} + struct filedesc_to_leader * filedesc_to_leader_alloc(struct filedesc_to_leader *old, struct filedesc *fdp, struct proc *leader) diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h index 345576438c67..5a4b3de33104 100644 --- a/sys/sys/filedesc.h +++ b/sys/sys/filedesc.h @@ -214,6 +214,7 @@ enum { #define falloc(td, resultfp, resultfd, flags) \ falloc_caps(td, resultfp, resultfd, flags, NULL) +struct mount; struct thread; static __inline void @@ -230,6 +231,7 @@ void filecaps_free(struct filecaps *fcaps); int closef(struct file *fp, struct thread *td); void closef_nothread(struct file *fp); +int descrip_check_write_mp(struct filedesc *fdp, struct mount *mp); int dupfdopen(struct thread *td, struct filedesc *fdp, int dfd, int mode, int openerror, int *indxp); int falloc_caps(struct thread *td, struct file **resultfp, int *resultfd,