The branch main has been updated by mjg:
URL:
https://cgit.FreeBSD.org/src/commit/?id=72b3b5a941927f7a79611131f144eeb2dc9143c9
commit 72b3b5a941927f7a79611131f144eeb2dc9143c9
Author: Mateusz Guzik <m...@freebsd.org>
AuthorDate: 2021-04-08 07:08:41 +0000
Commit: Mateusz Guzik <m...@freebsd.org>
CommitDate: 2021-04-08 11:14:45 +0000
vfs: replace vfs_smr_quiesce with vfs_smr_synchronize
This ends up using a smr specific method.
Suggested by: markj
Tested by: pho
---
sys/kern/vfs_cache.c | 12 ++++++------
sys/sys/vnode.h | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index c4b6fdd468db..8819ef483af5 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -2683,7 +2683,7 @@ cache_vnode_init(struct vnode *vp)
*
* This will force a fs lookup.
*
- * Synchronisation is done in 2 steps, calling vfs_smr_quiesce each time
+ * Synchronisation is done in 2 steps, calling vfs_smr_synchronize each time
* to observe all CPUs not performing the lookup.
*/
static void
@@ -2699,14 +2699,14 @@ cache_changesize_set_temp(struct nchashhead *temptbl,
u_long temphash)
*/
atomic_store_long(&nchash, temphash);
atomic_thread_fence_rel();
- vfs_smr_quiesce();
+ vfs_smr_synchronize();
/*
* At this point everyone sees the updated hash value, but they still
* see the old table.
*/
atomic_store_ptr(&nchashtbl, temptbl);
atomic_thread_fence_rel();
- vfs_smr_quiesce();
+ vfs_smr_synchronize();
/*
* At this point everyone sees the updated table pointer and size pair.
*/
@@ -2729,14 +2729,14 @@ cache_changesize_set_new(struct nchashhead *new_tbl,
u_long new_hash)
*/
atomic_store_ptr(&nchashtbl, new_tbl);
atomic_thread_fence_rel();
- vfs_smr_quiesce();
+ vfs_smr_synchronize();
/*
* At this point everyone sees the updated pointer value, but they
* still see the old size.
*/
atomic_store_long(&nchash, new_hash);
atomic_thread_fence_rel();
- vfs_smr_quiesce();
+ vfs_smr_synchronize();
/*
* At this point everyone sees the updated table pointer and size pair.
*/
@@ -3881,7 +3881,7 @@ cache_fplookup_lockout(void)
if (on) {
atomic_store_char(&cache_fast_lookup_enabled, false);
atomic_thread_fence_rel();
- vfs_smr_quiesce();
+ vfs_smr_synchronize();
}
}
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index 3bb6936a27b2..f45824e3dc89 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -1112,7 +1112,7 @@ int vn_dir_check_exec(struct vnode *vp, struct
componentname *cnp);
#define VFS_SMR() vfs_smr
#define vfs_smr_enter() smr_enter(VFS_SMR())
#define vfs_smr_exit() smr_exit(VFS_SMR())
-#define vfs_smr_quiesce() quiesce_all_critical()
+#define vfs_smr_synchronize() smr_synchronize(VFS_SMR())
#define vfs_smr_entered_load(ptr) smr_entered_load((ptr), VFS_SMR())
#define VFS_SMR_ASSERT_ENTERED() SMR_ASSERT_ENTERED(VFS_SMR())
#define VFS_SMR_ASSERT_NOT_ENTERED() SMR_ASSERT_NOT_ENTERED(VFS_SMR())
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
