Page MenuHomeFreeBSD

D61754.1795190574.diff
No OneTemporary

Authored By
Unknown
Size
7 KB
Referenced Files
None
Subscribers
None

D61754.1795190574.diff

diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c
--- a/sys/fs/tmpfs/tmpfs_subr.c
+++ b/sys/fs/tmpfs/tmpfs_subr.c
@@ -658,17 +658,21 @@
atomic_thread_fence_rel();
break;
- case VREG:
- nnode->tn_reg.tn_aobj =
- vm_pager_allocate(tmpfs_pager_type, NULL, 0,
+ case VREG: {
+ vm_object_t object;
+
+ object = vm_pager_allocate(tmpfs_pager_type, NULL, 0,
VM_PROT_DEFAULT, 0,
NULL /* XXXKIB - tmpfs needs swap reservation */);
- nnode->tn_reg.tn_aobj->un_pager.swp.swp_priv = nnode;
- vm_object_set_flag(nnode->tn_reg.tn_aobj, OBJ_TMPFS);
+ VM_OBJECT_WLOCK(object);
+ object->un_pager.swp.swp_priv = nnode;
+ vm_object_set_flag(object, OBJ_TMPFS);
+ VM_OBJECT_WUNLOCK(object);
+ nnode->tn_reg.tn_aobj = object;
nnode->tn_reg.tn_tmp = tmp;
nnode->tn_reg.tn_pages = 0;
break;
-
+ }
default:
panic("tmpfs_alloc_node: type %p %d", nnode,
(int)nnode->tn_type);
diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c
--- a/sys/kern/uipc_shm.c
+++ b/sys/kern/uipc_shm.c
@@ -2261,7 +2261,7 @@
shmfd = NULL;
sx_slock(&shm_dict_lock);
VM_OBJECT_RLOCK(obj);
- if ((obj->flags & OBJ_POSIXSHM) == 0) {
+ if ((obj->flags & (OBJ_DEAD | OBJ_POSIXSHM)) != OBJ_POSIXSHM) {
error = EINVAL;
} else {
if (obj->type == shmfd_pager_type)
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -233,9 +233,11 @@
mtx_lock(&dev_pager_mtx);
} else {
mtx_lock(&dev_pager_mtx);
+ VM_OBJECT_WLOCK(object);
object->flags |= OBJ_COLORED;
object->pg_color = color;
object->un_pager.devp.handle = handle;
+ VM_OBJECT_WUNLOCK(object);
wakeup(&object->un_pager.devp.handle);
}
}
@@ -268,7 +270,10 @@
void
cdev_pager_get_path(vm_object_t object, char *path, size_t sz)
{
- if (object->un_pager.devp.ops->cdev_pg_path != NULL)
+ VM_OBJECT_ASSERT_LOCKED(object);
+
+ if (object->un_pager.devp.handle != NULL &&
+ object->un_pager.devp.ops->cdev_pg_path != NULL)
object->un_pager.devp.ops->cdev_pg_path(
object->un_pager.devp.handle, path, sz);
}
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -2059,18 +2059,11 @@
/*
* Dead objects are eventually terminated on their own.
+ *
+ * Synchronize with _vm_object_allocate().
*/
- if ((object->flags & OBJ_DEAD) != 0)
- goto next_obj;
-
- /*
- * Sync with fences placed after pctrie
- * initialization. We must not access pctrie below
- * unless we checked that our object is swap and not
- * dead.
- */
- atomic_thread_fence_acq();
- if ((object->flags & OBJ_SWAP) == 0)
+ if ((atomic_load_acq_int(&object->flags) &
+ (OBJ_DEAD | OBJ_SWAP)) != OBJ_SWAP)
goto next_obj;
swap_pager_swapoff_object(sp, object, &bp);
diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -330,7 +330,7 @@
return (false);
}
-void vm_object_clear_flag(vm_object_t object, u_short bits);
+void vm_object_clear_flag(vm_object_t object, u_int bits);
void vm_object_pip_add(vm_object_t object, short i);
void vm_object_pip_wakeup(vm_object_t object);
void vm_object_pip_wakeupn(vm_object_t object, short i);
@@ -355,7 +355,7 @@
vm_object_t vm_object_allocate (objtype_t, vm_pindex_t);
vm_object_t vm_object_allocate_anon(vm_pindex_t, vm_object_t, struct ucred *);
-vm_object_t vm_object_allocate_dyn(objtype_t, vm_pindex_t, u_short);
+vm_object_t vm_object_allocate_dyn(objtype_t, vm_pindex_t, u_int);
boolean_t vm_object_coalesce(vm_object_t, vm_ooffset_t, vm_size_t, vm_size_t,
int);
void vm_object_collapse (vm_object_t);
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -176,6 +176,8 @@
vm_object_t object;
object = (vm_object_t)mem;
+ KASSERT((object->flags & OBJ_DEAD) != 0,
+ ("object %p not dead yet", object));
KASSERT(object->ref_count == 0,
("object %p ref_count = %d", object, object->ref_count));
KASSERT(vm_radix_is_empty(&object->rtree),
@@ -227,24 +229,14 @@
}
static void
-_vm_object_allocate(objtype_t type, vm_pindex_t size, u_short flags,
+_vm_object_allocate(objtype_t type, vm_pindex_t size, u_int flags,
vm_object_t object, void *handle)
{
LIST_INIT(&object->shadow_head);
- object->type = type;
- object->flags = flags;
- if ((flags & OBJ_SWAP) != 0) {
+ memset(&object->un_pager, 0, sizeof(object->un_pager));
+ if ((flags & OBJ_SWAP) != 0)
pctrie_init(&object->un_pager.swp.swp_blks);
- object->un_pager.swp.writemappings = 0;
- }
-
- /*
- * Ensure that swap_pager_swapoff() iteration over object_list
- * sees up to date type and pctrie head if it observed
- * non-dead object.
- */
- atomic_thread_fence_rel();
object->pg_color = 0;
object->size = size;
@@ -261,6 +253,14 @@
LIST_INIT(&object->rvq);
#endif
umtx_shm_object_init(object);
+
+ /*
+ * Clear OBJ_DEAD only after other initialization is done,
+ * to synchronize with global object list traversal, e.g., in
+ * swap_pager_swapoff() or vm_object_list_handler().
+ */
+ object->type = type;
+ atomic_store_rel_int(&object->flags, flags);
}
/*
@@ -304,7 +304,7 @@
}
void
-vm_object_clear_flag(vm_object_t object, u_short bits)
+vm_object_clear_flag(vm_object_t object, u_int bits)
{
VM_OBJECT_ASSERT_WLOCKED(object);
@@ -399,7 +399,7 @@
vm_object_allocate(objtype_t type, vm_pindex_t size)
{
vm_object_t object;
- u_short flags;
+ u_int flags;
switch (type) {
case OBJT_DEAD:
@@ -431,7 +431,7 @@
}
vm_object_t
-vm_object_allocate_dyn(objtype_t dyntype, vm_pindex_t size, u_short flags)
+vm_object_allocate_dyn(objtype_t dyntype, vm_pindex_t size, u_int flags)
{
vm_object_t object;
@@ -2523,7 +2523,7 @@
vm_object_t obj;
vm_page_t m;
u_long sp;
- int count, error;
+ int count, error, flags;
key_t key;
unsigned short seq;
bool want_path;
@@ -2556,12 +2556,14 @@
*/
mtx_lock(&vm_object_list_mtx);
TAILQ_FOREACH(obj, &vm_object_list, object_list) {
- if (obj->type == OBJT_DEAD ||
+ if (obj->type == OBJT_DEAD || (obj->flags & OBJ_DEAD) != 0 ||
(swap_only && (obj->flags & (OBJ_ANON | OBJ_SWAP)) == 0))
continue;
VM_OBJECT_RLOCK(obj);
- if (obj->type == OBJT_DEAD ||
- (swap_only && (obj->flags & (OBJ_ANON | OBJ_SWAP)) == 0)) {
+ /* Synchronize with _vm_object_allocate(). */
+ flags = atomic_load_acq_int(&obj->flags);
+ if (obj->type == OBJT_DEAD || (flags & OBJ_DEAD) != 0 ||
+ (swap_only && (flags & (OBJ_ANON | OBJ_SWAP)) == 0)) {
VM_OBJECT_RUNLOCK(obj);
continue;
}
@@ -2604,7 +2606,7 @@
NULL);
if (vp != NULL) {
vref(vp);
- } else if ((obj->flags & OBJ_ANON) != 0) {
+ } else if ((flags & OBJ_ANON) != 0) {
MPASS(kvo->kvo_type == KVME_TYPE_SWAP);
kvo->kvo_me = (uintptr_t)obj;
/* tmpfs objs are reported as vnodes */
@@ -2617,13 +2619,18 @@
sizeof(kvo->kvo_path));
}
VM_OBJECT_RUNLOCK(obj);
- if ((obj->flags & OBJ_SYSVSHM) != 0) {
+
+ /*
+ * Note, it is safe to invoke shmobjinfo() and shm_get_path()
+ * concurrent with teardown of the object.
+ */
+ if ((flags & OBJ_SYSVSHM) != 0) {
kvo->kvo_flags |= KVMO_FLAG_SYSVSHM;
shmobjinfo(obj, &key, &seq);
kvo->kvo_vn_fileid = key;
kvo->kvo_vn_fsid_freebsd11 = seq;
}
- if ((obj->flags & OBJ_POSIXSHM) != 0) {
+ if ((flags & OBJ_POSIXSHM) != 0) {
kvo->kvo_flags |= KVMO_FLAG_POSIXSHM;
shm_get_path(obj, kvo->kvo_path,
sizeof(kvo->kvo_path));
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -293,6 +293,7 @@
VM_OBJECT_WLOCK(object);
KASSERT(object->ref_count == 1,
("leaked ref %p %d", object, object->ref_count));
+ vm_object_set_flag(object, OBJ_DEAD);
object->type = OBJT_DEAD;
refcount_init(&object->ref_count, 0);
VM_OBJECT_WUNLOCK(object);

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 20, 4:02 PM (22 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41870818
Default Alt Text
D61754.1795190574.diff (7 KB)

Event Timeline