* [GIT PULL] md-next 20220703
@ 2022-07-03 15:13 Song Liu
2022-07-03 16:02 ` Jens Axboe
0 siblings, 1 reply; 5+ messages in thread
From: Song Liu @ 2022-07-03 15:13 UTC (permalink / raw)
To: Jens Axboe, linux-raid
Cc: Logan Gunthorpe, Guoqing Jiang, Chris Webb, Zhang Jiaming
Hi Jens,
Please consider pulling the following changes on top of your for-5.20/drivers
branch. The major changes are:
1. Improve raid5 lock contention, by Logan Gunthorpe.
2. Misc fixes to raid5, by Logan Gunthorpe.
3. Fix race condition with md_reap_sync_thread(), by Guoqing Jiang.
Thanks,
Song
The following changes since commit 197f80d97e9ccc8a496f4935ba939f3ed7432d53:
drbd: bm_page_async_io: fix spurious bitmap "IO error" on large volumes (2022-06-27 06:29:22 -0600)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/song/md.git md-next
for you to fetch changes up to ff4ec5f79108cf82fe7168547c76fe754c4ade0a:
md: Fix spelling mistake in comments (2022-07-03 07:59:16 -0700)
----------------------------------------------------------------
Chris Webb (1):
md: Explicitly create command-line configured devices
Guoqing Jiang (1):
md: unlock mddev before reap sync_thread in action_store
Logan Gunthorpe (25):
md/raid5-log: Drop extern decorators for function prototypes
md/raid5-ppl: Drop unused argument from ppl_handle_flush_request()
md/raid5: suspend the array for calls to log_exit()
md/raid5-cache: Take mddev_lock in r5c_journal_mode_show()
md/raid5-cache: Drop RCU usage of conf->log
md/raid5-cache: Clear conf->log after finishing work
md/raid5-cache: Annotate pslot with __rcu notation
md: Use enum for overloaded magic numbers used by mddev->curr_resync
md: Ensure resync is reported after it starts
md: Notify sysfs sync_completed in md_reap_sync_thread()
md/raid5: Make logic blocking check consistent with logic that blocks
md/raid5: Factor out ahead_of_reshape() function
md/raid5: Refactor raid5_make_request loop
md/raid5: Move stripe_add_to_batch_list() call out of add_stripe_bio()
md/raid5: Move common stripe get code into new find_get_stripe() helper
md/raid5: Factor out helper from raid5_make_request() loop
md/raid5: Drop the do_prepare flag in raid5_make_request()
md/raid5: Move read_seqcount_begin() into make_stripe_request()
md/raid5: Refactor for loop in raid5_make_request() into while loop
md/raid5: Keep a reference to last stripe_head for batch
md/raid5: Refactor add_stripe_bio()
md/raid5: Check all disks in a stripe_head for reshape progress
md/raid5: Pivot raid5_make_request()
md/raid5: Improve debug prints
md/raid5: Increase restriction on max segments per request
Song Liu (1):
MAINTAINERS: add patchwork link to linux-raid project
Zhang Jiaming (1):
md: Fix spelling mistake in comments
MAINTAINERS | 1 +
drivers/md/dm-raid.c | 1 +
drivers/md/md-autodetect.c | 1 +
drivers/md/md-cluster.c | 4 +-
drivers/md/md.c | 76 ++++++++++++++++---------
drivers/md/md.h | 16 ++++++
drivers/md/raid5-cache.c | 40 +++++++------
drivers/md/raid5-log.h | 77 ++++++++++++-------------
drivers/md/raid5-ppl.c | 2 +-
drivers/md/raid5.c | 646 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------
10 files changed, 549 insertions(+), 315 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [GIT PULL] md-next 20220703
2022-07-03 15:13 [GIT PULL] md-next 20220703 Song Liu
@ 2022-07-03 16:02 ` Jens Axboe
2022-07-03 16:19 ` Jens Axboe
0 siblings, 1 reply; 5+ messages in thread
From: Jens Axboe @ 2022-07-03 16:02 UTC (permalink / raw)
To: Song Liu, linux-raid
Cc: Logan Gunthorpe, Guoqing Jiang, Chris Webb, Zhang Jiaming
On 7/3/22 9:13 AM, Song Liu wrote:
> Hi Jens,
>
> Please consider pulling the following changes on top of your for-5.20/drivers
> branch. The major changes are:
>
> 1. Improve raid5 lock contention, by Logan Gunthorpe.
> 2. Misc fixes to raid5, by Logan Gunthorpe.
> 3. Fix race condition with md_reap_sync_thread(), by Guoqing Jiang.
>
I pulled this in, but what I pulled doesn't match this pull request.
There seems to be an extra patch in there, and diffstat doesn't match
what is in your email:
> MAINTAINERS | 1 +
> drivers/md/dm-raid.c | 1 +
> drivers/md/md-autodetect.c | 1 +
> drivers/md/md-cluster.c | 4 +-
> drivers/md/md.c | 76 ++++++++++++++++---------
> drivers/md/md.h | 16 ++++++
> drivers/md/raid5-cache.c | 40 +++++++------
> drivers/md/raid5-log.h | 77 ++++++++++++-------------
> drivers/md/raid5-ppl.c | 2 +-
> drivers/md/raid5.c | 646 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------
> 10 files changed, 549 insertions(+), 315 deletions(-)
MAINTAINERS | 1 +
drivers/block/drbd/drbd_bitmap.c | 49 +++-
drivers/md/dm-raid.c | 1 +
drivers/md/md-autodetect.c | 1 +
drivers/md/md-cluster.c | 4 +-
drivers/md/md.c | 76 +++--
drivers/md/md.h | 16 ++
drivers/md/raid5-cache.c | 40 ++-
drivers/md/raid5-log.h | 77 +++--
drivers/md/raid5-ppl.c | 2 +-
drivers/md/raid5.c | 654 +++++++++++++++++++++++++++---------------
11 files changed, 595 insertions(+), 326 deletions(-)
--
Jens Axboe
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [GIT PULL] md-next 20220703
2022-07-03 16:02 ` Jens Axboe
@ 2022-07-03 16:19 ` Jens Axboe
2022-07-03 23:49 ` Song Liu
0 siblings, 1 reply; 5+ messages in thread
From: Jens Axboe @ 2022-07-03 16:19 UTC (permalink / raw)
To: Song Liu, linux-raid
Cc: Logan Gunthorpe, Guoqing Jiang, Chris Webb, Zhang Jiaming
On 7/3/22 10:02 AM, Jens Axboe wrote:
> On 7/3/22 9:13 AM, Song Liu wrote:
>> Hi Jens,
>>
>> Please consider pulling the following changes on top of your for-5.20/drivers
>> branch. The major changes are:
>>
>> 1. Improve raid5 lock contention, by Logan Gunthorpe.
>> 2. Misc fixes to raid5, by Logan Gunthorpe.
>> 3. Fix race condition with md_reap_sync_thread(), by Guoqing Jiang.
>>
>
> I pulled this in, but what I pulled doesn't match this pull request.
> There seems to be an extra patch in there, and diffstat doesn't match
> what is in your email:
>
>> MAINTAINERS | 1 +
>> drivers/md/dm-raid.c | 1 +
>> drivers/md/md-autodetect.c | 1 +
>> drivers/md/md-cluster.c | 4 +-
>> drivers/md/md.c | 76 ++++++++++++++++---------
>> drivers/md/md.h | 16 ++++++
>> drivers/md/raid5-cache.c | 40 +++++++------
>> drivers/md/raid5-log.h | 77 ++++++++++++-------------
>> drivers/md/raid5-ppl.c | 2 +-
>> drivers/md/raid5.c | 646 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------
>> 10 files changed, 549 insertions(+), 315 deletions(-)
>
> MAINTAINERS | 1 +
> drivers/block/drbd/drbd_bitmap.c | 49 +++-
> drivers/md/dm-raid.c | 1 +
> drivers/md/md-autodetect.c | 1 +
> drivers/md/md-cluster.c | 4 +-
> drivers/md/md.c | 76 +++--
> drivers/md/md.h | 16 ++
> drivers/md/raid5-cache.c | 40 ++-
> drivers/md/raid5-log.h | 77 +++--
> drivers/md/raid5-ppl.c | 2 +-
> drivers/md/raid5.c | 654 +++++++++++++++++++++++++++---------------
> 11 files changed, 595 insertions(+), 326 deletions(-)
TUrns out I pulled it into the wrong branch. But even after correcting
that, I now see:
MAINTAINERS | 1 +
drivers/md/dm-raid.c | 1 +
drivers/md/md-autodetect.c | 1 +
drivers/md/md-cluster.c | 4 +-
drivers/md/md.c | 76 ++++--
drivers/md/md.h | 16 ++
drivers/md/raid5-cache.c | 40 ++-
drivers/md/raid5-log.h | 77 +++---
drivers/md/raid5-ppl.c | 2 +-
drivers/md/raid5.c | 654 +++++++++++++++++++++++++++++++-----------------
10 files changed, 553 insertions(+), 319 deletions(-)
which is still off, with the discrepancy being in raid5.c?
--
Jens Axboe
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [GIT PULL] md-next 20220703
2022-07-03 16:19 ` Jens Axboe
@ 2022-07-03 23:49 ` Song Liu
2022-07-04 1:42 ` Jens Axboe
0 siblings, 1 reply; 5+ messages in thread
From: Song Liu @ 2022-07-03 23:49 UTC (permalink / raw)
To: Jens Axboe
Cc: linux-raid, Logan Gunthorpe, Guoqing Jiang, Chris Webb,
Zhang Jiaming
> On Jul 3, 2022, at 9:19 AM, Jens Axboe <axboe@kernel.dk> wrote:
>
> On 7/3/22 10:02 AM, Jens Axboe wrote:
>> On 7/3/22 9:13 AM, Song Liu wrote:
>>> Hi Jens,
>>>
>>> Please consider pulling the following changes on top of your for-5.20/drivers
>>> branch. The major changes are:
>>>
>>> 1. Improve raid5 lock contention, by Logan Gunthorpe.
>>> 2. Misc fixes to raid5, by Logan Gunthorpe.
>>> 3. Fix race condition with md_reap_sync_thread(), by Guoqing Jiang.
>>>
>>
>> I pulled this in, but what I pulled doesn't match this pull request.
>> There seems to be an extra patch in there, and diffstat doesn't match
>> what is in your email:
>>
>>> MAINTAINERS | 1 +
>>> drivers/md/dm-raid.c | 1 +
>>> drivers/md/md-autodetect.c | 1 +
>>> drivers/md/md-cluster.c | 4 +-
>>> drivers/md/md.c | 76 ++++++++++++++++---------
>>> drivers/md/md.h | 16 ++++++
>>> drivers/md/raid5-cache.c | 40 +++++++------
>>> drivers/md/raid5-log.h | 77 ++++++++++++-------------
>>> drivers/md/raid5-ppl.c | 2 +-
>>> drivers/md/raid5.c | 646 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------
>>> 10 files changed, 549 insertions(+), 315 deletions(-)
>>
>> MAINTAINERS | 1 +
>> drivers/block/drbd/drbd_bitmap.c | 49 +++-
>> drivers/md/dm-raid.c | 1 +
>> drivers/md/md-autodetect.c | 1 +
>> drivers/md/md-cluster.c | 4 +-
>> drivers/md/md.c | 76 +++--
>> drivers/md/md.h | 16 ++
>> drivers/md/raid5-cache.c | 40 ++-
>> drivers/md/raid5-log.h | 77 +++--
>> drivers/md/raid5-ppl.c | 2 +-
>> drivers/md/raid5.c | 654 +++++++++++++++++++++++++++---------------
>> 11 files changed, 595 insertions(+), 326 deletions(-)
>
> TUrns out I pulled it into the wrong branch. But even after correcting
> that, I now see:
>
> MAINTAINERS | 1 +
> drivers/md/dm-raid.c | 1 +
> drivers/md/md-autodetect.c | 1 +
> drivers/md/md-cluster.c | 4 +-
> drivers/md/md.c | 76 ++++--
> drivers/md/md.h | 16 ++
> drivers/md/raid5-cache.c | 40 ++-
> drivers/md/raid5-log.h | 77 +++---
> drivers/md/raid5-ppl.c | 2 +-
> drivers/md/raid5.c | 654 +++++++++++++++++++++++++++++++-----------------
> 10 files changed, 553 insertions(+), 319 deletions(-)
>
> which is still off, with the discrepancy being in raid5.c?
Hmm... I just pulled your for-5.20/drivers branch again, and I am still getting the
original diff:
MAINTAINERS | 1 +
drivers/md/dm-raid.c | 1 +
drivers/md/md-autodetect.c | 1 +
drivers/md/md-cluster.c | 4 +-
drivers/md/md.c | 76 ++++++++++++-------
drivers/md/md.h | 16 ++++
drivers/md/raid5-cache.c | 40 +++++-----
drivers/md/raid5-log.h | 77 +++++++++----------
drivers/md/raid5-ppl.c | 2 +-
drivers/md/raid5.c | 646 ++++++++++++++++++++++++++++++++++++++++++++++++++\
+++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------\
----------------------------
10 files changed, 549 insertions(+), 315 deletions(-)
Is is because different git versions? My current version is git version 2.30.2.
Thanks,
Song
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [GIT PULL] md-next 20220703
2022-07-03 23:49 ` Song Liu
@ 2022-07-04 1:42 ` Jens Axboe
0 siblings, 0 replies; 5+ messages in thread
From: Jens Axboe @ 2022-07-04 1:42 UTC (permalink / raw)
To: Song Liu
Cc: linux-raid, Logan Gunthorpe, Guoqing Jiang, Chris Webb,
Zhang Jiaming
On 7/3/22 5:49 PM, Song Liu wrote:
>
>
>> On Jul 3, 2022, at 9:19 AM, Jens Axboe <axboe@kernel.dk> wrote:
>>
>> On 7/3/22 10:02 AM, Jens Axboe wrote:
>>> On 7/3/22 9:13 AM, Song Liu wrote:
>>>> Hi Jens,
>>>>
>>>> Please consider pulling the following changes on top of your for-5.20/drivers
>>>> branch. The major changes are:
>>>>
>>>> 1. Improve raid5 lock contention, by Logan Gunthorpe.
>>>> 2. Misc fixes to raid5, by Logan Gunthorpe.
>>>> 3. Fix race condition with md_reap_sync_thread(), by Guoqing Jiang.
>>>>
>>>
>>> I pulled this in, but what I pulled doesn't match this pull request.
>>> There seems to be an extra patch in there, and diffstat doesn't match
>>> what is in your email:
>>>
>>>> MAINTAINERS | 1 +
>>>> drivers/md/dm-raid.c | 1 +
>>>> drivers/md/md-autodetect.c | 1 +
>>>> drivers/md/md-cluster.c | 4 +-
>>>> drivers/md/md.c | 76 ++++++++++++++++---------
>>>> drivers/md/md.h | 16 ++++++
>>>> drivers/md/raid5-cache.c | 40 +++++++------
>>>> drivers/md/raid5-log.h | 77 ++++++++++++-------------
>>>> drivers/md/raid5-ppl.c | 2 +-
>>>> drivers/md/raid5.c | 646 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------
>>>> 10 files changed, 549 insertions(+), 315 deletions(-)
>>>
>>> MAINTAINERS | 1 +
>>> drivers/block/drbd/drbd_bitmap.c | 49 +++-
>>> drivers/md/dm-raid.c | 1 +
>>> drivers/md/md-autodetect.c | 1 +
>>> drivers/md/md-cluster.c | 4 +-
>>> drivers/md/md.c | 76 +++--
>>> drivers/md/md.h | 16 ++
>>> drivers/md/raid5-cache.c | 40 ++-
>>> drivers/md/raid5-log.h | 77 +++--
>>> drivers/md/raid5-ppl.c | 2 +-
>>> drivers/md/raid5.c | 654 +++++++++++++++++++++++++++---------------
>>> 11 files changed, 595 insertions(+), 326 deletions(-)
>>
>> TUrns out I pulled it into the wrong branch. But even after correcting
>> that, I now see:
>>
>> MAINTAINERS | 1 +
>> drivers/md/dm-raid.c | 1 +
>> drivers/md/md-autodetect.c | 1 +
>> drivers/md/md-cluster.c | 4 +-
>> drivers/md/md.c | 76 ++++--
>> drivers/md/md.h | 16 ++
>> drivers/md/raid5-cache.c | 40 ++-
>> drivers/md/raid5-log.h | 77 +++---
>> drivers/md/raid5-ppl.c | 2 +-
>> drivers/md/raid5.c | 654 +++++++++++++++++++++++++++++++-----------------
>> 10 files changed, 553 insertions(+), 319 deletions(-)
>>
>> which is still off, with the discrepancy being in raid5.c?
>
> Hmm... I just pulled your for-5.20/drivers branch again, and I am
> still getting the original diff:
>
> MAINTAINERS | 1 +
> drivers/md/dm-raid.c | 1 +
> drivers/md/md-autodetect.c | 1 +
> drivers/md/md-cluster.c | 4 +-
> drivers/md/md.c | 76 ++++++++++++-------
> drivers/md/md.h | 16 ++++
> drivers/md/raid5-cache.c | 40 +++++-----
> drivers/md/raid5-log.h | 77 +++++++++----------
> drivers/md/raid5-ppl.c | 2 +-
> drivers/md/raid5.c | 646 ++++++++++++++++++++++++++++++++++++++++++++++++++\
> +++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------\
> ----------------------------
> 10 files changed, 549 insertions(+), 315 deletions(-)
>
> Is is because different git versions? My current version is git
> version 2.30.2.
Oh, I think I may know what it is. It's the histrogram vs default diff.
I just checked the results and it looks fine. Sorry for the noise, there
was nothing wrong with your pull request! Now queued up.
--
Jens Axboe
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-07-04 1:42 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-03 15:13 [GIT PULL] md-next 20220703 Song Liu
2022-07-03 16:02 ` Jens Axboe
2022-07-03 16:19 ` Jens Axboe
2022-07-03 23:49 ` Song Liu
2022-07-04 1:42 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).