From: kettenis <kettenis@openbsd.org>
Date: Thu, 8 Dec 2022 21:32:48 +0000 (+0000)
Subject: Call vget(9) in uvn_put() to make sure we hold a reference if we're called
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=b8f3f99a4673846ff4291a8bc35d93e8f06f46bf;p=openbsd

Call vget(9) in uvn_put() to make sure we hold a reference if we're called
by the pagedaemon for a persisting vnode.  This prevents a panic in
uvm_vnp_unache() since a persisting vnode has a reference count of zero.
This should also prevent the vnode from being recycled from under our
feet while we're doing I/O to it.

This fixes the "macppc panic: vref used where vget required" issue.

tested by bluhm@, tb@
ok mpi@
---

diff --git a/sys/uvm/uvm_vnode.c b/sys/uvm/uvm_vnode.c
index 2883c6ba48e..ada3a61f46f 100644
--- a/sys/uvm/uvm_vnode.c
+++ b/sys/uvm/uvm_vnode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_vnode.c,v 1.130 2022/10/20 13:31:52 mpi Exp $	*/
+/*	$OpenBSD: uvm_vnode.c,v 1.131 2022/12/08 21:32:48 kettenis Exp $	*/
 /*	$NetBSD: uvm_vnode.c,v 1.36 2000/11/24 20:34:01 chs Exp $	*/
 
 /*
@@ -899,12 +899,35 @@ uvn_cluster(struct uvm_object *uobj, voff_t offset, voff_t *loffset,
 int
 uvn_put(struct uvm_object *uobj, struct vm_page **pps, int npages, int flags)
 {
-	int retval;
+	struct uvm_vnode *uvn = (struct uvm_vnode *)uobj;
+	int dying, retval;
 
 	KASSERT(rw_write_held(uobj->vmobjlock));
 
+	/*
+	 * Unless we're recycling this vnode, grab a reference to it
+	 * to prevent it from being recycled from under our feet.
+	 * This also makes sure we can don't panic if we end up in
+	 * uvn_vnp_uncache() as a result of the I/O operation as that
+	 * function assumes we hold a reference.
+	 *
+	 * If the vnode is in the process of being recycled by someone
+	 * else, grabbing a refernce will fail.  In that case the
+	 * pages will already be written out by whoever is cleaning
+	 * the vnode, so simply return VM_PAGER_AGAIN such that we
+	 * skip these pages.
+	 */
+	dying = (uvn->u_flags & UVM_VNODE_DYING);
+	if (!dying) {
+		if (vget(uvn->u_vnode, LK_NOWAIT))
+			return VM_PAGER_AGAIN;
+	}
+
 	retval = uvn_io((struct uvm_vnode*)uobj, pps, npages, flags, UIO_WRITE);
 
+	if (!dying)
+		vrele(uvn->u_vnode);
+
 	return retval;
 }