💬 ชาวเน็ตแห่แชร์: openzfs/zfs/pull/

mattmacy · 2019-07-03T00:01:30Z

Motivation and Context

This adds support for FreeBSD to ZoL. Adding FreeBSD support to ZoL will make it easier to move changes back and forth between FreeBSD and Linux.

Description

import FreeBSD's SPL
add ifdefs in common code where it made more sense to do so than duplicate the code in separate files

How Has This Been Tested?

Adapted ZTS and have all tests that pass on HEAD passing on ZoF. Allan Jude and some developers have been using it personally.

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)
Documentation (a change to man pages or other documentation)

Checklist:

My code follows the ZFS on Linux code style requirements.
I have updated the documentation accordingly.
I have read the contributing document.
I have added tests to cover my changes.
All new and existing tests passed.
All commit messages are properly formatted and contain Signed-off-by.

lundman · 2019-07-03T00:31:05Z

 			uint_t		abd_nents;
 			struct scatterlist *abd_sgl;
+#endif
 		} abd_scatter;


I do wonder if #if linux around the scatterlist wouldn't be easier, or it'll be
#if ( defined(__FreeBSD__) || defined(__APPLE__) || defined(_WIN32)) && defined(_KERNEL)
But don't change anything, just curious what people think, is reducing #ifdefs even on the agenda just yet? I'm probably here waaay too early

@lundman your timing is perfect! Reducing the #ifdefs is definitely on the agenda as is any additional refactoring we should be considering to make things easier when adding additional platforms.

openzfs/zfs#8987

This brings us up to date with the code currently in review in: openzfs/zfs#8987 git-svn-id: svn+ssh://svn.freebsd.org/ports/head@506233 35697150-7ecd-e111-bb59-0022644237b5

This brings us up to date with the code currently in review in: openzfs/zfs#8987

This brings us up to date with the code currently in review in: openzfs/zfs#8987 git-svn-id: svn+ssh://svn.freebsd.org/ports/head@506233 35697150-7ecd-e111-bb59-0022644237b5

richardelling · 2019-07-10T20:25:13Z

NB, when building packages, such as rpm, the build system looks for shebang in files to generate the package dependencies. Thus you will need to ensure the dependency on python3 in packages remains.

lundman · 2019-12-04T02:46:26Z

I think maybe ./include/sys/avl.h and ./include/os/freebsd/spl/sys/avl.h are nearly identical and the former could be made to work for both. But if it is intentionally meant to replace, then ignore me :)

kithrup

This mostly looks good to me. (Only "mostly" because it's so large that I can't say I didn't miss some. Mostly I looked at the changes, and I'd already been looking at the new files over time.)

rlaager · 2019-12-14T21:47:09Z

We can probably close #898 once this is merged.

mattmacy · 2019-12-15T03:26:26Z

We can probably close #898 once this is merged.

Ask @lundman as he has targets that deviate the most from Linux. Certainly adding OS #3 will be vastly less time consuming than OS #2 was.

codecov-io · 2020-04-09T02:30:11Z

Codecov Report

Merging #8987 into master will decrease coverage by 0.18%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #8987      +/-   ##
==========================================
- Coverage   79.48%   79.30%   -0.19%     
==========================================
  Files         387      388       +1     
  Lines      123388   123386       -2     
==========================================
- Hits        98079    97855     -224     
- Misses      25309    25531     +222

Flag	Coverage Δ
#kernel	`79.86% <ø> (-0.10%)`	⬇️
#user	`65.70% <100.00%> (-0.41%)`	⬇️

Impacted Files	Coverage Δ
cmd/zpool/zpool_vdev.c	`90.63% <ø> (ø)`
include/os/freebsd/linux/compiler.h	`100.00% <ø> (ø)`
include/os/linux/kernel/linux/blkdev_compat.h	`73.21% <ø> (-2.20%)`	⬇️
module/os/linux/zfs/zvol_os.c	`87.00% <ø> (ø)`
lib/libzfs/libzfs_util.c	`74.49% <100.00%> (ø)`
module/os/linux/spl/spl-zlib.c	`55.35% <0.00%> (-28.58%)`	⬇️
module/zfs/vdev_indirect.c	`74.16% <0.00%> (-9.84%)`	⬇️
module/os/linux/spl/spl-kmem-cache.c	`75.58% <0.00%> (-9.23%)`	⬇️
module/zfs/space_map.c	`93.81% <0.00%> (-4.46%)`	⬇️
module/zfs/spa_checkpoint.c	`93.78% <0.00%> (-4.35%)`	⬇️
... and 55 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 20f2878...69c630f. Read the comment docs.

- Import FreeBSD specific parts Signed-off-by: Matt Macy <mmacy@FreeBSD.org> Co-authored-by: Ryan Moeller <ryan@iXsystems.com> Signed-off-by: Ryan Moeller <ryan@iXsystems.com> Requires-builders: arch,style,coverage,amazon2,centos7,debian10,ubuntu16,ubuntu18,builtin,freebsd12,freebsd13

behlendorf added the Status: Design Review Needed Architecture or design is under discussion label Jul 3, 2019

mattmacy force-pushed the projects/pr-rebase branch from 673caef to d51c99b Compare July 3, 2019 00:20

lundman reviewed Jul 3, 2019

View reviewed changes

mattmacy force-pushed the projects/pr-rebase branch from d51c99b to e0f971d Compare July 3, 2019 00:32

ahrens changed the title ~~Projects/pr rebase~~ Add support for FreeBSD Jul 3, 2019

mattmacy force-pushed the projects/pr-rebase branch 6 times, most recently from 9e6ea37 to 4df3869 Compare July 6, 2019 19:15

kmoore134 added a commit to truenas/ports that referenced this pull request Jul 8, 2019

Import latest ZoL that is currently in review in:

1a6e35c

openzfs/zfs#8987

uqs pushed a commit to freebsd/freebsd-ports that referenced this pull request Jul 8, 2019

- Update to 2019070800

db5acd7

This brings us up to date with the code currently in review in: openzfs/zfs#8987

mattmacy force-pushed the projects/pr-rebase branch from d63de7c to ff98df6 Compare July 8, 2019 21:53

mattmacy force-pushed the projects/pr-rebase branch 3 times, most recently from e6ea76b to 137b90d Compare July 10, 2019 18:22

mattmacy force-pushed the projects/pr-rebase branch from 7db8ab1 to 774a635 Compare July 11, 2019 01:05

rlaager reviewed Jul 12, 2019

View reviewed changes

Comment thread Makefile.am Outdated

Comment thread README.md Outdated

Comment thread cmd/arc_summary/arc_summary2

Comment thread cmd/arc_summary/arc_summary2 Outdated

Comment thread config/always-sed.m4

Comment thread copy-builtin

mattmacy force-pushed the projects/pr-rebase branch 8 times, most recently from 9b19313 to 4e4e10c Compare July 21, 2019 22:58

mattmacy force-pushed the projects/pr-rebase branch 5 times, most recently from 914cfb4 to 0b4ee27 Compare October 26, 2019 00:03

mattmacy force-pushed the projects/pr-rebase branch 9 times, most recently from 1e0a9ce to 04be8b3 Compare November 1, 2019 19:19

mattmacy force-pushed the projects/pr-rebase branch 4 times, most recently from 323f22a to 30e03ce Compare November 28, 2019 01:05

mattmacy force-pushed the projects/pr-rebase branch 2 times, most recently from 3a00066 to 2d0ea9b Compare December 3, 2019 21:42

kithrup approved these changes Dec 12, 2019

View reviewed changes

behlendorf reviewed Dec 19, 2019

View reviewed changes

alek-p reviewed Feb 25, 2020

View reviewed changes

Comment thread module/os/freebsd/spl/spl_taskq.c Outdated

behlendorf approved these changes Apr 14, 2020

View reviewed changes

asomers mentioned this pull request Jun 14, 2024

Make txg_wait_synced conditional in zfsvfs_teardown, for FreeBSD #16268

Merged

4 of 13 tasks

Conversation

mattmacy commented Jul 3, 2019 • edited by ghost Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Motivation and Context

Description

How Has This Been Tested?

Types of changes

Checklist:

Uh oh!

lundman Jul 3, 2019

Choose a reason for hiding this comment

Uh oh!

behlendorf Jul 3, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

richardelling commented Jul 10, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

lundman commented Dec 4, 2019

Uh oh!

kithrup left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rlaager commented Dec 14, 2019

Uh oh!

mattmacy commented Dec 15, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov-io commented Apr 9, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

mattmacy commented Jul 3, 2019 •

edited by ghost

Loading

behlendorf Jul 3, 2019 •

edited

Loading

richardelling commented Jul 10, 2019 •

edited

Loading

kithrup left a comment •

edited

Loading

codecov-io commented Apr 9, 2020 •

edited

Loading