Skip to contentSkip to conversation

Fujitsu for 4.5

GIT PULL Zhao Lei 3 participants 9 messages Jan 13, 2016 – Feb 16, 2016 Btrfs file system

lore
Share & tools
lore

Zhao Lei

author
#0 lore raw

Hi Chris,

This is collection of some bug fix, enhance and cleanup from fujitsu against btrfs for v4.5, mainly for reada, plus some small fix and cleanup for scrub and raid56.

All patchs are in btrfs-maillist, rebased on top of integration-4.5.

TEST STATUS:
Tested by xfstests, btrfs and generic group with default mount option, diffed result with 4.4-rc8 and confirmed no regression:
Diff From:
dir=/var/ltf/testqueue/v4.4-rc8/xfstests/
head=v4.4-rc8
Diff To:
dir=/var/ltf/testqueue/8e16378041f7f3531c256fd3e17a36a4fca92d29 head=v4.4-rc6_00037_8e1637
Test:
node=ALL
Decrease items:
none

Xfstests for other 9 mount options is in running, I'll check results after finished.

Would you please consider merging the following fixes to integration-4.5 branch?

REPO is:
https://github.com/zhaoleidd/btrfs.git integration-4.5

--
Zhao Lei (26):
btrfs: Small cleanup for get index_srcdev loop
btrfs: Use direct way to determine raid56 write/recover mode
btrfs: Fix in-segment calculation for reada
btrfs: reduce additional fs_info->reada_lock in reada_find_zone
btrfs: Add missed segment checking in reada_find_zone
btrfs: reada: Avoid many times of empty loop
btrfs: reada: Move is_need_to_readahead contition earlier
btrfs: reada: add all reachable mirrors into reada device list
btrfs: reada: bypass adding extent when all zone failed
btrfs: reada: Remove level argument in severial functions
btrfs: reada: move reada_extent_put to place after __readahead_hook()
btrfs: reada: Pass reada_extent into __readahead_hook directly
btrfs: reada: Use fs_info instead of root in __readahead_hook's
argument
btrfs: reada: Jump into cleanup in direct way for __readahead_hook()
btrfs: reada: Fix a debug code typo
btrfs: Continue write in case of can_not_nocow
btrfs: delete no_used argument in btrfs_copy_from_user
btrfs: merge functions for wait snapshot creation
btrfs: reada: limit max works count
btrfs: reada: simplify dev->reada_in_flight processing
btrfs: Fix no_space in write and rm loop
btrfs: Fix calculation of rbio->dbitmap's size calculation
btrfs: Use unified stripe_page's index calculation
btrfs: use rbio->nr_pages to reduce calculation
btrfs: Remove unnecessary ClearPageUptodate for raid56
btrfs: raid56: Use raid_write_end_io for scrub

 fs/btrfs/ctree.h       |   5 +-
 fs/btrfs/disk-io.c     |  22 ++---
 fs/btrfs/extent-tree.c |  24 +++++-
 fs/btrfs/file.c        |  43 +++++-----
 fs/btrfs/inode.c       |  22 +----
 fs/btrfs/raid56.c      | 100 ++++++++--------------
 fs/btrfs/reada.c       | 224 ++++++++++++++++++++++++-------------------------
 fs/btrfs/scrub.c       |   2 +-
 fs/btrfs/volumes.c     |  45 +++++-----
 9 files changed, 225 insertions(+), 262 deletions(-)

Thanks
Zhaolei

#1 lore raw
Quoted 9 lines · Zhao Lei

This is collection of some bug fix, enhance and cleanup from fujitsu against btrfs for v4.5, mainly for reada, plus some small fix and cleanup for scrub and raid56.

All patchs are in btrfs-maillist, rebased on top of integration-4.5.

Would you please consider merging the following fixes to integration-4.5 branch?

Zhao Lei (26):

...

Quoted 11 lines

btrfs: reada: Avoid many times of empty loop
btrfs: reada: Move is_need_to_readahead contition earlier
btrfs: reada: add all reachable mirrors into reada device list
btrfs: reada: bypass adding extent when all zone failed
btrfs: reada: Remove level argument in severial functions
btrfs: reada: move reada_extent_put to place after __readahead_hook()
btrfs: reada: Pass reada_extent into __readahead_hook directly
btrfs: reada: Use fs_info instead of root in __readahead_hook's
argument
btrfs: reada: Jump into cleanup in direct way for __readahead_hook()
btrfs: reada: Fix a debug code typo

...

Quoted 2 lines

btrfs: reada: limit max works count
btrfs: reada: simplify dev->reada_in_flight processing

I have reviewed the readahead patches and ack them for 4.5.

author
#2 lore raw

Hi, David Sterba

Quoted 29 lines

From: David Sterba [mailto:[email protected]]
Sent: Thursday, January 14, 2016 10:17 PM
To: Zhao Lei <[email protected]>
Cc: 'Chris Mason' <[email protected]>; 'btrfs' <[email protected]>
Subject: Re: [GIT PULL] Fujitsu for 4.5

Quoted 7 lines · Zhao Lei

This is collection of some bug fix, enhance and cleanup from fujitsu against btrfs for v4.5, mainly for reada, plus some small fix and cleanup for scrub and raid56.

All patchs are in btrfs-maillist, rebased on top of integration-4.5.

Would you please consider merging the following fixes to integration-4.5

branch?

Quoted 1 line

Zhao Lei (26):

...

Quoted 11 lines

btrfs: reada: Avoid many times of empty loop
btrfs: reada: Move is_need_to_readahead contition earlier
btrfs: reada: add all reachable mirrors into reada device list
btrfs: reada: bypass adding extent when all zone failed
btrfs: reada: Remove level argument in severial functions
btrfs: reada: move reada_extent_put to place after __readahead_hook()
btrfs: reada: Pass reada_extent into __readahead_hook directly
btrfs: reada: Use fs_info instead of root in __readahead_hook's
argument
btrfs: reada: Jump into cleanup in direct way for __readahead_hook()
btrfs: reada: Fix a debug code typo

Quoted 5 lines

...

Quoted 2 lines

btrfs: reada: limit max works count
btrfs: reada: simplify dev->reada_in_flight processing

I have reviewed the readahead patches and ack them for 4.5.

Great thanks for reviewing these patchs.

And following 3 patchs in this branch are also for readahead, but sorry that I forgot adding "reada" prefix in subject.
btrfs: Fix in-segment calculation for reada
btrfs: reduce additional fs_info->reada_lock in reada_find_zone
btrfs: Add missed segment checking in reada_find_zone

Would you please consider helping me to review them?

Thanks
Zhaolei

#3 lore raw
Quoted 7 lines · Zhao Lei

And following 3 patchs in this branch are also for readahead, but sorry that I forgot adding "reada" prefix in subject.
btrfs: Fix in-segment calculation for reada
btrfs: reduce additional fs_info->reada_lock in reada_find_zone
btrfs: Add missed segment checking in reada_find_zone

Would you please consider helping me to review them?

All three reviewed and look ok, but the changelogs could be improved, eg. what are the implications of missing the zones etc.

author
#4 lore raw

Hi, David Sterba

Quoted 14 lines

From: David Sterba [mailto:[email protected]]
Sent: Saturday, January 16, 2016 12:50 AM
To: Zhao Lei <[email protected]>
Cc: [email protected]; 'Chris Mason' <[email protected]>; 'btrfs' <[email protected]>
Subject: Re: [GIT PULL] Fujitsu for 4.5

Quoted 6 lines · Zhao Lei

And following 3 patchs in this branch are also for readahead, but sorry that I forgot adding "reada" prefix in subject.
btrfs: Fix in-segment calculation for reada
btrfs: reduce additional fs_info->reada_lock in reada_find_zone
btrfs: Add missed segment checking in reada_find_zone

Quoted 4 lines
Quoted 1 line

Would you please consider helping me to review them?

All three reviewed and look ok, but the changelogs could be improved, eg. what are the implications of missing the zones etc.

Thanks for review.
I'll update changelogs in the tree.

Thanks
Zhaolei

#5 lore raw
In reply to David Sterba
Quoted 22 lines · David Sterba
Quoted 9 lines · Zhao Lei

This is collection of some bug fix, enhance and cleanup from fujitsu against btrfs for v4.5, mainly for reada, plus some small fix and cleanup for scrub and raid56.

All patchs are in btrfs-maillist, rebased on top of integration-4.5.

Would you please consider merging the following fixes to integration-4.5 branch?

Zhao Lei (26):

...

Quoted 11 lines

btrfs: reada: Avoid many times of empty loop
btrfs: reada: Move is_need_to_readahead contition earlier
btrfs: reada: add all reachable mirrors into reada device list
btrfs: reada: bypass adding extent when all zone failed
btrfs: reada: Remove level argument in severial functions
btrfs: reada: move reada_extent_put to place after __readahead_hook()
btrfs: reada: Pass reada_extent into __readahead_hook directly
btrfs: reada: Use fs_info instead of root in __readahead_hook's
argument
btrfs: reada: Jump into cleanup in direct way for __readahead_hook()
btrfs: reada: Fix a debug code typo

Quoted 5 lines

...

Quoted 2 lines

btrfs: reada: limit max works count
btrfs: reada: simplify dev->reada_in_flight processing

I have reviewed the readahead patches and ack them for 4.5.

My plan is to send the first 4.5 pull on Monday with the current integration. I hit an oom during overnight runs, and I'm double checking things after that.

I'll get the reada stuff merged for a second pull.

-chris

#6 lore raw
In reply to Zhao Lei
Quoted 5 lines · Zhao Lei

This is collection of some bug fix, enhance and cleanup from fujitsu against btrfs for v4.5, mainly for reada, plus some small fix and cleanup for scrub and raid56.

All patchs are in btrfs-maillist, rebased on top of integration-4.5.

I was trying to isolate safe fixes for 4.5 but saw hangs (same as Chris reported) and was not able to find the right followups.

Can you please collect all your readahead patches sent recently? I got lost. Make it a git branch and let me know, I'll add it to for-next and send pull request for 4.6 later.

author
#7 lore raw

Hi, David Sterba

Thanks for notice me, sorry for reply late.

Quoted 7 lines

From: David Sterba [mailto:[email protected]]
Sent: Wednesday, February 10, 2016 6:14 PM
To: Zhao Lei <[email protected]>
Cc: 'Chris Mason' <[email protected]>; 'btrfs' <[email protected]>
Subject: Re: [GIT PULL] Fujitsu for 4.5

On Wed, Jan 13, 2016 at 05:28:12PM +0800, Zhao Lei wrote:

Quoted 9 lines
Quoted 5 lines

This is collection of some bug fix, enhance and cleanup from fujitsu against btrfs for v4.5, mainly for reada, plus some small fix and cleanup for scrub and raid56.

All patchs are in btrfs-maillist, rebased on top of integration-4.5.

I was trying to isolate safe fixes for 4.5 but saw hangs (same as Chris reported) and was not able to find the right followups.

The problem is discussed in btrfs maillist from:
http://www.spinics.net/lists/linux-btrfs/msg51275.html
to
http://www.spinics.net/lists/linux-btrfs/msg51538.html

It is fixed now.

Quoted 3 lines

Can you please collect all your readahead patches sent recently? I got lost. Make it a git branch and let me know, I'll add it to for-next and send pull request for 4.6 later.

I collected all reada patchs in:
https://github.com/zhaoleidd/btrfs.git integration-4.5

The description of above branch is this:
http://www.spinics.net/lists/linux-btrfs/msg51531.html

Thanks
Zhaolei

#8 lore raw
Quoted 25 lines · Zhao Lei

Hi, David Sterba

Thanks for notice me, sorry for reply late.

Quoted 7 lines

From: David Sterba [mailto:[email protected]]
Sent: Wednesday, February 10, 2016 6:14 PM
To: Zhao Lei <[email protected]>
Cc: 'Chris Mason' <[email protected]>; 'btrfs' <[email protected]>
Subject: Re: [GIT PULL] Fujitsu for 4.5

On Wed, Jan 13, 2016 at 05:28:12PM +0800, Zhao Lei wrote:

Quoted 9 lines
Quoted 5 lines

This is collection of some bug fix, enhance and cleanup from fujitsu against btrfs for v4.5, mainly for reada, plus some small fix and cleanup for scrub and raid56.

All patchs are in btrfs-maillist, rebased on top of integration-4.5.

I was trying to isolate safe fixes for 4.5 but saw hangs (same as Chris reported) and was not able to find the right followups.

The problem is discussed in btrfs maillist from:
http://www.spinics.net/lists/linux-btrfs/msg51275.html
to
http://www.spinics.net/lists/linux-btrfs/msg51538.html

Quoted 7 lines

It is fixed now.

Quoted 3 lines

Can you please collect all your readahead patches sent recently? I got lost. Make it a git branch and let me know, I'll add it to for-next and send pull request for 4.6 later.

I collected all reada patchs in:
https://github.com/zhaoleidd/btrfs.git integration-4.5

There's patch

btrfs: Continue write in case of can_not_nocow

that does not count as readahead fix, so I'll pull it via different branch.