Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FreeBSD: libspl: Add locking around statfs globals #13484

Merged
merged 1 commit into from
May 24, 2022
Merged

FreeBSD: libspl: Add locking around statfs globals #13484

merged 1 commit into from
May 24, 2022

Conversation

ghost
Copy link

@ghost ghost commented May 20, 2022

Motivation and Context

External consumers of libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find may encounter a race condition on FreeBSD due to a lack of locking around
internal global structures used by getmntent and getmntany in libspl.

Description

Make getmntent and getmntany thread-safe by adding a pthread rwlock.

How Has This Been Tested?

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
  • Documentation (a change to man pages or other documentation)

Checklist:

FreeBSD: libspl: Add locking around statfs globals
52dbc7f 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
@ghost ghost requested a review from amotin May 20, 2022 15:24
@ghost ghost added Status: Code Review Needed Ready for review and testing Component: Userspace user space functionality labels May 20, 2022
@ghost
Copy link
Author

ghost commented May 20, 2022

This should apply cleanly to 2.1 as well.

amotin
amotin approved these changes May 20, 2022
View reviewed changes
Copy link
Member

@amotin amotin left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was first thinking whether it could use pthread_once(), but then I found that it refreshes the list in some cases, so it makes sense. But now I am a bit worrying about other thread calling getmntany() or just starting its own traversal with getmntent() will refresh the list, that change the data at position pointed by the seek offset. Though it may the best we can do within the API limitations at least for getmntent() if we want to refresh the cached data.

@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels May 20, 2022
@behlendorf behlendorf merged commit 2e05765 into openzfs:master May 24, 2022
@ghost ghost deleted the gsfs_lock branch May 24, 2022 17:18
behlendorf pushed a commit to behlendorf/zfs that referenced this pull request May 25, 2022
@behlendorf
FreeBSD: libspl: Add locking around statfs globals
f627515 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
behlendorf pushed a commit that referenced this pull request May 27, 2022
@behlendorf
FreeBSD: libspl: Add locking around statfs globals
fde66e5 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes #13484
nicman23 pushed a commit to nicman23/zfs that referenced this pull request Aug 22, 2022
@nicman23
FreeBSD: libspl: Add locking around statfs globals
6b7f0c3 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
nicman23 pushed a commit to nicman23/zfs that referenced this pull request Aug 22, 2022
@nicman23
FreeBSD: libspl: Add locking around statfs globals
2b6050a 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
lundman pushed a commit to openzfsonwindows/openzfs that referenced this pull request Sep 12, 2022
@lundman
FreeBSD: libspl: Add locking around statfs globals
1db044c 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
beren12 pushed a commit to beren12/zfs that referenced this pull request Sep 19, 2022
@beren12
FreeBSD: libspl: Add locking around statfs globals
4afd85b 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@andrewc12
FreeBSD: libspl: Add locking around statfs globals
5dd5c58 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@andrewc12
FreeBSD: libspl: Add locking around statfs globals
e7f9ae8 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@andrewc12
FreeBSD: libspl: Add locking around statfs globals
e596c1b 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@andrewc12
FreeBSD: libspl: Add locking around statfs globals
68a05f3 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@andrewc12
FreeBSD: libspl: Add locking around statfs globals
d591ecd 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@andrewc12
FreeBSD: libspl: Add locking around statfs globals
7e8f13f 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@andrewc12
FreeBSD: libspl: Add locking around statfs globals
f311fa6 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@andrewc12
FreeBSD: libspl: Add locking around statfs globals
fe67a56 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@andrewc12
FreeBSD: libspl: Add locking around statfs globals
5233875 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@andrewc12
FreeBSD: libspl: Add locking around statfs globals
405582d 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@andrewc12
FreeBSD: libspl: Add locking around statfs globals
766f280 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@andrewc12
FreeBSD: libspl: Add locking around statfs globals
8d83871 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@andrewc12
FreeBSD: libspl: Add locking around statfs globals
edfdbe5 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@andrewc12
FreeBSD: libspl: Add locking around statfs globals
1c6ecc2 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@andrewc12
FreeBSD: libspl: Add locking around statfs globals
54786b7 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@andrewc12
FreeBSD: libspl: Add locking around statfs globals
55301ff 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@andrewc12
FreeBSD: libspl: Add locking around statfs globals
0a964ba 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@andrewc12
FreeBSD: libspl: Add locking around statfs globals
7aff74e 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@andrewc12
FreeBSD: libspl: Add locking around statfs globals
f025031 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@andrewc12
FreeBSD: libspl: Add locking around statfs globals
0145024 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@andrewc12
FreeBSD: libspl: Add locking around statfs globals
6e48e9a 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@andrewc12
FreeBSD: libspl: Add locking around statfs globals
6cc6146 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@andrewc12
FreeBSD: libspl: Add locking around statfs globals
4bb6e0a 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@andrewc12
FreeBSD: libspl: Add locking around statfs globals
0d93c38 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@andrewc12
FreeBSD: libspl: Add locking around statfs globals
b27b8f4 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@andrewc12
FreeBSD: libspl: Add locking around statfs globals
faeeeae 
Makes getmntent and getmntany thread-safe for external consumers of
libzfs zpool_disable_datasets, zfs_iter_mounted, libzfs_mnttab_update,
libzfs_mnttab_find.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes openzfs#13484
bsdjhb pushed a commit to CTSRD-CHERI/zfs that referenced this pull request Jul 13, 2023
@mmatuska @bsdjhb
zfs_zstd: FreeBSD-local changes to add IN_LIBSA guards.
ca5d0e6 
This is not associated with a specific upstream commit but apparently
a local diff applied as part of:

commit e3aa18ad71782a73d3dd9dd3d526bbd2b607ca16
Merge: 645886d028c8 b9d9845
Author: Martin Matuska <mm@FreeBSD.org>
Date:   Fri Jun 3 17:58:39 2022 +0200

    zfs: merge openzfs/zfs@b9d98453f

    Notable upstream pull request merges:
      openzfs#12321 Fix inflated quiesce time caused by lwb_tx during zil_commit()
      openzfs#13244 zstd early abort
      openzfs#13360 Verify BPs as part of spa_load_verify_cb()
      openzfs#13452 More speculative prefetcher improvements
      openzfs#13466 Expose zpool guids through kstats
      openzfs#13476 Refactor Log Size Limit
      openzfs#13484 FreeBSD: libspl: Add locking around statfs globals
      openzfs#13498 Cancel in-progress rebuilds when we finish removal
      openzfs#13499 zed: Take no action on scrub/resilver checksum errors
      openzfs#13513 Remove wrong assertion in log spacemap

    Obtained from:  OpenZFS
    OpenZFS commit: b9d9845
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Component: Userspace user space functionality Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@behlendorf @amotin