* [GIT PULL] MD update for 4.12
@ 2017-05-01 22:50 Shaohua Li
2017-05-03 17:27 ` Linus Torvalds
0 siblings, 1 reply; 3+ messages in thread
From: Shaohua Li @ 2017-05-01 22:50 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel, linux-raid, neilb
Hi,
Please pull MD update for 4.12. There are conflicts between MD tree and block
tree, so I did a merge before the pull request. This update includes:
- Add Partial Parity Log (ppl) feature found in Intel IMSM raid array by Artur
Paszkiewicz. This feature is another way to close RAID5 writehole. The Linux
implementation is also available for normal RAID5 array if specific superblock
bit is set.
- A number of md-cluser fixes and enabling md-cluster array resize from Guoqing
Jiang
- A bunch of patches from Ming Lei and Neil Brown to rewrite MD bio handling
related code. Now MD doesn't directly access bio bvec, bi_phys_segments and
uses modern bio API for bio split.
- Improve RAID5 IO pattern to improve performance for hard disk based RAID5/6
from me.
- Several patches from Song Liu to speed up raid5-cache recovery and allow
raid5 cache feature disabling in runtime.
- Fix a performance regression in raid1 resync from Xiao Ni.
- Other cleanup and fixes from various people.
Thanks,
Shaohua
The following changes since commit 85724edecbdc19f53ed4b902fc3a32e4d1b61c9b:
Merge tag 'leds_for_4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds (2017-05-01 13:12:49 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git for-linus
for you to fetch changes up to e265eb3a30543a237b2ebc4e0422ac82e55b07e4:
Merge branch 'md-next' into md-linus (2017-05-01 14:09:21 -0700)
----------------------------------------------------------------
Artur Paszkiewicz (12):
md: superblock changes for PPL
raid5: separate header for log functions
raid5-ppl: Partial Parity Log write logging implementation
md: add sysfs entries for PPL
raid5-ppl: load and recover the log
raid5-ppl: support disk hot add/remove with PPL
raid5-ppl: runtime PPL enabling or disabling
raid5-ppl: move no_mem_stripes to struct ppl_conf
raid5-ppl: use resize_stripes() when enabling or disabling ppl
raid5-ppl: partial parity calculation optimization
raid5-ppl: use a single mempool for ppl_io_unit and header_page
uapi: fix linux/raid/md_p.h userspace compilation error
Christophe JAILLET (1):
md-cluster: Fix a memleak in an error handling path
Dan Carpenter (1):
raid5-ppl: silence a misleading warning message
Dennis Yang (1):
md: update slab_cache before releasing new stripes when stripes resizing
Guoqing Jiang (9):
md-cluster: use sync way to handle METADATA_UPDATED msg
md-cluster: add CHANGE_CAPACITY message type
md-cluster: introduce cluster_check_sync_size
md-cluster: add the support for resize
md: move bitmap_destroy to the beginning of __md_stop
md/raid10: refactor some codes from raid10_write_request
md/raid10: reset the 'first' at the end of loop
md/raid10: wait up frozen array in handle_write_completed
md: clear WantReplacement once disk is removed
Jason Yan (1):
md/raid5-cache: fix payload endianness problem in raid5-cache
Lidong Zhong (1):
md/raid1/10: remove unused queue
Ming Lei (15):
md: raid1/raid10: don't handle failure of bio_add_page()
md: move two macros into md.h
md: prepare for managing resync I/O pages in clean way
md: raid1: simplify r1buf_pool_free()
md: raid1: don't use bio's vec table to manage resync pages
md: raid1: retrieve page from pre-allocated resync page array
md: raid1: use bio helper in process_checks()
block: introduce bio_copy_data_partial
md: raid1: move 'offset' out of loop
md: raid1: improve write behind
md: raid10: refactor code of read reshape's .bi_end_io
md: raid10: don't use bio's vec table to manage resync pages
md: raid10: retrieve page from preallocated resync page array
md: raid10: avoid direct access to bvec table in handle_reshape_read_error
md: raid1: kill warning on powerpc_pseries
NeilBrown (30):
md/raid5: use md_write_start to count stripes, not bios
md/raid5: simplfy delaying of writes while metadata is updated.
md/raid5: call bio_endio() directly rather than queueing for later.
md/raid5: use bio_inc_remaining() instead of repurposing bi_phys_segments as a counter
md/raid5: remove over-loading of ->bi_phys_segments.
Revert "md/raid5: limit request size according to implementation limits"
md/raid1, raid10: move rXbio accounting closer to allocation.
md/raid10: stop using bi_phys_segments
md/raid1: stop using bi_phys_segment
md/raid5: don't test ->writes_pending in raid5_remove_disk
md: factor out set_in_sync()
md: close a race with setting mddev->in_sync
percpu-refcount: support synchronous switch to atomic mode.
MD: use per-cpu counter for writes_pending
md/raid6: Fix anomily when recovering a single device in RAID6.
md: MD_CLOSING needs to be cleared after called md_set_readonly or do_md_stop
md/raid1: avoid reusing a resync bio after error handling.
md/raid1: simplify the splitting of requests.
md/raid1: simplify alloc_behind_master_bio()
Revert "block: introduce bio_copy_data_partial"
md/raid1: simplify handle_read_error().
md/raid1: factor out flush_bio_list()
md/raid10: simplify the splitting of requests.
md/raid10: simplify handle_read_error()
md/raid5: make chunk_aligned_read() split bios more cleanly.
md/linear: improve bio splitting.
md/raid0: fix up bio splitting.
md: allow creation of mdNNN arrays via md_mod/parameters/new_array
md: support disabling of create-on-open semantics.
md: handle read-only member devices better.
Shaohua Li (7):
md/raid5: prioritize stripes for writeback
md/raid5-cache: bump flush stripe batch size
md/raid5: sort bios
block: remove bio_clone_bioset_partial()
md/raid1: skip data copy for behind io for discard request
md/raid10: skip spare disk as 'first' disk
Merge branch 'md-next' into md-linus
Song Liu (4):
md/r5cache: improve recovery with read ahead page pool
md/r5cache: handle R5LOG_PAYLOAD_FLUSH in recovery
md/r5cache: generate R5LOG_PAYLOAD_FLUSH
md/raid5: use consistency_policy to remove journal feature
Xiao Ni (1):
md/raid1: Use a new variable to count flighting sync requests
Zhilong Liu (2):
md: fix several trivial typos in comments
md.c:didn't unlock the mddev before return EINVAL in array_size_store
Documentation/admin-guide/md.rst | 32 +-
Documentation/md/md-cluster.txt | 2 +-
Documentation/md/raid5-ppl.txt | 44 ++
block/bio.c | 61 +-
drivers/md/Makefile | 2 +-
drivers/md/bitmap.c | 59 +-
drivers/md/bitmap.h | 3 +
drivers/md/linear.c | 75 ++-
drivers/md/md-cluster.c | 223 ++++++-
drivers/md/md-cluster.h | 1 +
drivers/md/md.c | 414 ++++++++++---
drivers/md/md.h | 71 ++-
drivers/md/raid0.c | 78 +--
drivers/md/raid1.c | 679 +++++++++-----------
drivers/md/raid1.h | 13 +-
drivers/md/raid10.c | 736 +++++++++-------------
drivers/md/raid10.h | 1 +
drivers/md/raid5-cache.c | 362 ++++++++---
drivers/md/raid5-log.h | 115 ++++
drivers/md/raid5-ppl.c | 1271 ++++++++++++++++++++++++++++++++++++++
drivers/md/raid5.c | 643 ++++++++++++-------
drivers/md/raid5.h | 106 +---
include/linux/bio.h | 11 +-
include/linux/percpu-refcount.h | 1 +
include/uapi/linux/raid/md_p.h | 45 +-
lib/percpu-refcount.c | 17 +
26 files changed, 3582 insertions(+), 1483 deletions(-)
create mode 100644 Documentation/md/raid5-ppl.txt
create mode 100644 drivers/md/raid5-log.h
create mode 100644 drivers/md/raid5-ppl.c
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [GIT PULL] MD update for 4.12
2017-05-01 22:50 [GIT PULL] MD update for 4.12 Shaohua Li
@ 2017-05-03 17:27 ` Linus Torvalds
2017-05-03 18:38 ` Shaohua Li
0 siblings, 1 reply; 3+ messages in thread
From: Linus Torvalds @ 2017-05-03 17:27 UTC (permalink / raw)
To: Shaohua Li; +Cc: Linux Kernel Mailing List, linux-raid, Neil Brown
On Mon, May 1, 2017 at 3:50 PM, Shaohua Li <shli@kernel.org> wrote:
>
> Please pull MD update for 4.12. There are conflicts between MD tree and block
> tree, so I did a merge before the pull request.
I pulled this, but *please* don't do those broken merges.
Why is it broken? Let me just count the merge message in its entirety:
"Merge branch 'md-next' into md-linus"
that's it. That doesn't really help anything. There is *no*
explanation for the merge. No "What", no "Why", nothing to explain why
you are merging with that _particular_ point in history.
In contrast, when I do merges, even if I don't have a lot of commit
message (and I try to have explanations - I will complain to
submaintainers if they don't give me enough information), there's very
much some implied information: "somebody asked Linus to pull this
point". I don't just randomly merge random points in development.
That merge, in contrast, very much merged completely random points in time.
In fact, the particular point you merged makes no sense at all and is
probably the *worst* possible kind of merge point. It's not just a
random point in time (me having just merged the LED drivers), it's a
point in the middle of the first day of the merge window. Which is
just about the *worst* possible thing to do, because that's often the
point that is the least reliable.
Seriously. DO NOT DO THIS!
I'm perfectly happy handling merge conflicts. I *much* prefer that
over this kind of "easy but crappy merge".
I appreciate it a lot if submaintainers do a "test merge" to see what
might conflict, and then explain what the conflict is and why it
happened in the pull request. That's absolutely lovely - it's a nice
heads-up about what happened, and it shows that you cared and you knew
about the conflict, and it makes me all warm and fuzzy.
But this kind of random bad merge of me tree during the most volatile
time of the merge window? That's just wrong. It doesn't even help me,
I probably spent about as much time looking at the conflct with your
merge in place as I would have when I resolved it, and then spent more
time writing this "please don't do this" rant than it would have taken
me to just do the merge.
Yes, occasionally the conflicts end up being nasty enough that I ask
people to verify my work. And _very_ occasionally I might ask you to
actually do the merge for me, but I don't recall when something was
really messy enough for that to happen. This did not look that messy
at all.
I have sent a variation of this email to people (and the mailing list)
probably approaching a hundred times over the 10+ years we've used
git.
Don't do back-merges unless you have a *really* good reason for it,
and if you have that reason, you had damn well *explain* that reason
in the merge message.
And "make the merge easier for Linus" is _never_ a good reason. If you
want to make life easier for me, please just do that test-merge and
explanation of what's going on: lots of maintainers do that, and I
really appreciate it. If you feel the merge isn't trivial, you can
even make the merge available as a ".. this is how I merged it" branch
- when people do that, I will actually end up doing the merge on my
own first (without looking at your merge), and then re-do the whole
thing *with* your merge in a test-branch, and verify the differences.
Because the differences (if there are any - it's seldom the case other
than trivial whitespace or other slight differences) are actually
really interesting markers for me, and tend to show where subtle
issues were.
But don't ask me to pull a pre-merged thing that just hides the conflicts.
Please please please don't do this.
Linus
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [GIT PULL] MD update for 4.12
2017-05-03 17:27 ` Linus Torvalds
@ 2017-05-03 18:38 ` Shaohua Li
0 siblings, 0 replies; 3+ messages in thread
From: Shaohua Li @ 2017-05-03 18:38 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Linux Kernel Mailing List, linux-raid, Neil Brown
On Wed, May 03, 2017 at 10:27:47AM -0700, Linus Torvalds wrote:
> On Mon, May 1, 2017 at 3:50 PM, Shaohua Li <shli@kernel.org> wrote:
> >
> > Please pull MD update for 4.12. There are conflicts between MD tree and block
> > tree, so I did a merge before the pull request.
>
> I pulled this, but *please* don't do those broken merges.
>
> Why is it broken? Let me just count the merge message in its entirety:
>
> "Merge branch 'md-next' into md-linus"
>
> that's it. That doesn't really help anything. There is *no*
> explanation for the merge. No "What", no "Why", nothing to explain why
> you are merging with that _particular_ point in history.
>
> In contrast, when I do merges, even if I don't have a lot of commit
> message (and I try to have explanations - I will complain to
> submaintainers if they don't give me enough information), there's very
> much some implied information: "somebody asked Linus to pull this
> point". I don't just randomly merge random points in development.
>
> That merge, in contrast, very much merged completely random points in time.
>
> In fact, the particular point you merged makes no sense at all and is
> probably the *worst* possible kind of merge point. It's not just a
> random point in time (me having just merged the LED drivers), it's a
> point in the middle of the first day of the merge window. Which is
> just about the *worst* possible thing to do, because that's often the
> point that is the least reliable.
>
> Seriously. DO NOT DO THIS!
>
> I'm perfectly happy handling merge conflicts. I *much* prefer that
> over this kind of "easy but crappy merge".
>
> I appreciate it a lot if submaintainers do a "test merge" to see what
> might conflict, and then explain what the conflict is and why it
> happened in the pull request. That's absolutely lovely - it's a nice
> heads-up about what happened, and it shows that you cared and you knew
> about the conflict, and it makes me all warm and fuzzy.
>
> But this kind of random bad merge of me tree during the most volatile
> time of the merge window? That's just wrong. It doesn't even help me,
> I probably spent about as much time looking at the conflct with your
> merge in place as I would have when I resolved it, and then spent more
> time writing this "please don't do this" rant than it would have taken
> me to just do the merge.
>
> Yes, occasionally the conflicts end up being nasty enough that I ask
> people to verify my work. And _very_ occasionally I might ask you to
> actually do the merge for me, but I don't recall when something was
> really messy enough for that to happen. This did not look that messy
> at all.
>
> I have sent a variation of this email to people (and the mailing list)
> probably approaching a hundred times over the 10+ years we've used
> git.
>
> Don't do back-merges unless you have a *really* good reason for it,
> and if you have that reason, you had damn well *explain* that reason
> in the merge message.
>
> And "make the merge easier for Linus" is _never_ a good reason. If you
> want to make life easier for me, please just do that test-merge and
> explanation of what's going on: lots of maintainers do that, and I
> really appreciate it. If you feel the merge isn't trivial, you can
> even make the merge available as a ".. this is how I merged it" branch
> - when people do that, I will actually end up doing the merge on my
> own first (without looking at your merge), and then re-do the whole
> thing *with* your merge in a test-branch, and verify the differences.
> Because the differences (if there are any - it's seldom the case other
> than trivial whitespace or other slight differences) are actually
> really interesting markers for me, and tend to show where subtle
> issues were.
>
> But don't ask me to pull a pre-merged thing that just hides the conflicts.
>
> Please please please don't do this.
Get it, thanks for the explanation!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-05-03 18:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-01 22:50 [GIT PULL] MD update for 4.12 Shaohua Li
2017-05-03 17:27 ` Linus Torvalds
2017-05-03 18:38 ` Shaohua Li
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.