* [git pull] device mapper fixes for 5.10-rc7
@ 2020-12-04 21:05 ` Mike Snitzer
0 siblings, 0 replies; 10+ messages in thread
From: Mike Snitzer @ 2020-12-04 21:05 UTC (permalink / raw)
To: Linus Torvalds
Cc: dm-devel, linux-block, Alasdair G Kergon, Mikulas Patocka,
Nick Desaulniers, Sergei Shtepa, Thomas Gleixner, axboe, vgoyal
Hi Linus,
The following changes since commit 09162bc32c880a791c6c0668ce0745cf7958f576:
Linux 5.10-rc4 (2020-11-15 16:44:31 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git tags/for-5.10/dm-fixes
for you to fetch changes up to bde3808bc8c2741ad3d804f84720409aee0c2972:
dm: remove invalid sparse __acquires and __releases annotations (2020-12-04 15:25:18 -0500)
Please pull, thanks!
Mike
----------------------------------------------------------------
- Fix DM's bio splitting changes that were made during v5.9.
Restores splitting in terms of varied per-target ti->max_io_len
rather than use block core's single stacked 'chunk_sectors' limit.
- Like DM crypt, update DM integrity to not use crypto drivers that
have CRYPTO_ALG_ALLOCATES_MEMORY set.
- Fix DM writecache target's argument parsing and status display.
- Remove needless BUG() from dm writecache's persistent_memory_claim()
- Remove old gcc workaround in DM cache target's block_div() for ARM
link errors now that gcc >= 4.9 is required.
- Fix RCU locking in dm_blk_report_zones and dm_dax_zero_page_range.
- Remove old, and now frowned upon, BUG_ON(in_interrupt()) in
dm_table_event().
- Remove invalid sparse annotations from dm_prepare_ioctl() and
dm_unprepare_ioctl().
----------------------------------------------------------------
Mike Snitzer (4):
dm writecache: remove BUG() and fail gracefully instead
dm: fix IO splitting
dm: fix double RCU unlock in dm_dax_zero_page_range() error path
dm: remove invalid sparse __acquires and __releases annotations
Mikulas Patocka (3):
dm integrity: don't use drivers that have CRYPTO_ALG_ALLOCATES_MEMORY
dm writecache: advance the number of arguments when reporting max_age
dm writecache: fix the maximum number of arguments
Nick Desaulniers (1):
Revert "dm cache: fix arm link errors with inline"
Sergei Shtepa (1):
dm: fix bug with RCU locking in dm_blk_report_zones
Thomas Gleixner (1):
dm table: Remove BUG_ON(in_interrupt())
block/blk-merge.c | 2 +-
drivers/md/dm-cache-target.c | 4 ----
drivers/md/dm-integrity.c | 4 ++--
drivers/md/dm-table.c | 11 -----------
drivers/md/dm-writecache.c | 6 ++++--
drivers/md/dm.c | 29 +++++++++++++++--------------
include/linux/blkdev.h | 11 ++++++-----
7 files changed, 28 insertions(+), 39 deletions(-)
^ permalink raw reply [flat|nested] 10+ messages in thread
* [dm-devel] [git pull] device mapper fixes for 5.10-rc7
@ 2020-12-04 21:05 ` Mike Snitzer
0 siblings, 0 replies; 10+ messages in thread
From: Mike Snitzer @ 2020-12-04 21:05 UTC (permalink / raw)
To: Linus Torvalds
Cc: axboe, Nick Desaulniers, linux-block, dm-devel, Mikulas Patocka,
vgoyal, Sergei Shtepa, Thomas Gleixner, Alasdair G Kergon
Hi Linus,
The following changes since commit 09162bc32c880a791c6c0668ce0745cf7958f576:
Linux 5.10-rc4 (2020-11-15 16:44:31 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git tags/for-5.10/dm-fixes
for you to fetch changes up to bde3808bc8c2741ad3d804f84720409aee0c2972:
dm: remove invalid sparse __acquires and __releases annotations (2020-12-04 15:25:18 -0500)
Please pull, thanks!
Mike
----------------------------------------------------------------
- Fix DM's bio splitting changes that were made during v5.9.
Restores splitting in terms of varied per-target ti->max_io_len
rather than use block core's single stacked 'chunk_sectors' limit.
- Like DM crypt, update DM integrity to not use crypto drivers that
have CRYPTO_ALG_ALLOCATES_MEMORY set.
- Fix DM writecache target's argument parsing and status display.
- Remove needless BUG() from dm writecache's persistent_memory_claim()
- Remove old gcc workaround in DM cache target's block_div() for ARM
link errors now that gcc >= 4.9 is required.
- Fix RCU locking in dm_blk_report_zones and dm_dax_zero_page_range.
- Remove old, and now frowned upon, BUG_ON(in_interrupt()) in
dm_table_event().
- Remove invalid sparse annotations from dm_prepare_ioctl() and
dm_unprepare_ioctl().
----------------------------------------------------------------
Mike Snitzer (4):
dm writecache: remove BUG() and fail gracefully instead
dm: fix IO splitting
dm: fix double RCU unlock in dm_dax_zero_page_range() error path
dm: remove invalid sparse __acquires and __releases annotations
Mikulas Patocka (3):
dm integrity: don't use drivers that have CRYPTO_ALG_ALLOCATES_MEMORY
dm writecache: advance the number of arguments when reporting max_age
dm writecache: fix the maximum number of arguments
Nick Desaulniers (1):
Revert "dm cache: fix arm link errors with inline"
Sergei Shtepa (1):
dm: fix bug with RCU locking in dm_blk_report_zones
Thomas Gleixner (1):
dm table: Remove BUG_ON(in_interrupt())
block/blk-merge.c | 2 +-
drivers/md/dm-cache-target.c | 4 ----
drivers/md/dm-integrity.c | 4 ++--
drivers/md/dm-table.c | 11 -----------
drivers/md/dm-writecache.c | 6 ++++--
drivers/md/dm.c | 29 +++++++++++++++--------------
include/linux/blkdev.h | 11 ++++++-----
7 files changed, 28 insertions(+), 39 deletions(-)
--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [git pull] device mapper fixes for 5.10-rc7
2020-12-04 21:05 ` [dm-devel] " Mike Snitzer
@ 2020-12-04 21:35 ` pr-tracker-bot
-1 siblings, 0 replies; 10+ messages in thread
From: pr-tracker-bot @ 2020-12-04 21:35 UTC (permalink / raw)
To: Mike Snitzer
Cc: Linus Torvalds, dm-devel, linux-block, Alasdair G Kergon,
Mikulas Patocka, Nick Desaulniers, Sergei Shtepa,
Thomas Gleixner, axboe, vgoyal
The pull request you sent on Fri, 4 Dec 2020 16:05:21 -0500:
> git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git tags/for-5.10/dm-fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/b3298500b23f0b53a8d81e0d5ad98a29db71f4f0
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [dm-devel] [git pull] device mapper fixes for 5.10-rc7
@ 2020-12-04 21:35 ` pr-tracker-bot
0 siblings, 0 replies; 10+ messages in thread
From: pr-tracker-bot @ 2020-12-04 21:35 UTC (permalink / raw)
To: Mike Snitzer
Cc: axboe, Nick Desaulniers, linux-block, dm-devel, Mikulas Patocka,
vgoyal, Sergei Shtepa, Thomas Gleixner, Linus Torvalds,
Alasdair G Kergon
The pull request you sent on Fri, 4 Dec 2020 16:05:21 -0500:
> git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git tags/for-5.10/dm-fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/b3298500b23f0b53a8d81e0d5ad98a29db71f4f0
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] block: fix incorrect branching in blk_max_size_offset() [was: Re: [git pull] device mapper fixes for 5.10-rc7]
2020-12-04 21:35 ` [dm-devel] " pr-tracker-bot
@ 2020-12-04 22:37 ` Mike Snitzer
-1 siblings, 0 replies; 10+ messages in thread
From: Mike Snitzer @ 2020-12-04 22:37 UTC (permalink / raw)
To: Linus Torvalds
Cc: dm-devel, linux-block, Alasdair G Kergon, Mikulas Patocka,
Nick Desaulniers, Sergei Shtepa, Thomas Gleixner, axboe, vgoyal
On Fri, Dec 04 2020 at 4:35P -0500,
pr-tracker-bot@kernel.org <pr-tracker-bot@kernel.org> wrote:
> The pull request you sent on Fri, 4 Dec 2020 16:05:21 -0500:
>
> > git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git tags/for-5.10/dm-fixes
>
> has been merged into torvalds/linux.git:
> https://git.kernel.org/torvalds/c/b3298500b23f0b53a8d81e0d5ad98a29db71f4f0
>
> Thank you!
Hi Linus,
This is _really_ embarrassing; but I screwed up the branching at the top
of blk_max_size_offset(), here is the fix:
From: Mike Snitzer <snitzer@redhat.com>
Date: Fri, 4 Dec 2020 17:21:03 -0500
Subject: [PATCH] block: fix incorrect branching in blk_max_size_offset()
If non-zero 'chunk_sectors' is passed in to blk_max_size_offset() that
override will be incorrectly ignored.
Old blk_max_size_offset() branching, prior to commit 3ee16db390b4,
must be used only if passed 'chunk_sectors' override is zero.
Fixes: 3ee16db390b4 ("dm: fix IO splitting")
Cc: stable@vger.kernel.org # 5.9
Reported-by: John Dorminy <jdorminy@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
---
include/linux/blkdev.h | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 24ae504cf77d..033eb5f73b65 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1076,10 +1076,12 @@ static inline unsigned int blk_max_size_offset(struct request_queue *q,
sector_t offset,
unsigned int chunk_sectors)
{
- if (!chunk_sectors && q->limits.chunk_sectors)
- chunk_sectors = q->limits.chunk_sectors;
- else
- return q->limits.max_sectors;
+ if (!chunk_sectors) {
+ if (q->limits.chunk_sectors)
+ chunk_sectors = q->limits.chunk_sectors;
+ else
+ return q->limits.max_sectors;
+ }
if (likely(is_power_of_2(chunk_sectors)))
chunk_sectors -= offset & (chunk_sectors - 1);
--
2.15.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [dm-devel] [PATCH] block: fix incorrect branching in blk_max_size_offset() [was: Re: [git pull] device mapper fixes for 5.10-rc7]
@ 2020-12-04 22:37 ` Mike Snitzer
0 siblings, 0 replies; 10+ messages in thread
From: Mike Snitzer @ 2020-12-04 22:37 UTC (permalink / raw)
To: Linus Torvalds
Cc: axboe, Nick Desaulniers, linux-block, dm-devel, Mikulas Patocka,
vgoyal, Sergei Shtepa, Thomas Gleixner, Alasdair G Kergon
On Fri, Dec 04 2020 at 4:35P -0500,
pr-tracker-bot@kernel.org <pr-tracker-bot@kernel.org> wrote:
> The pull request you sent on Fri, 4 Dec 2020 16:05:21 -0500:
>
> > git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git tags/for-5.10/dm-fixes
>
> has been merged into torvalds/linux.git:
> https://git.kernel.org/torvalds/c/b3298500b23f0b53a8d81e0d5ad98a29db71f4f0
>
> Thank you!
Hi Linus,
This is _really_ embarrassing; but I screwed up the branching at the top
of blk_max_size_offset(), here is the fix:
From: Mike Snitzer <snitzer@redhat.com>
Date: Fri, 4 Dec 2020 17:21:03 -0500
Subject: [PATCH] block: fix incorrect branching in blk_max_size_offset()
If non-zero 'chunk_sectors' is passed in to blk_max_size_offset() that
override will be incorrectly ignored.
Old blk_max_size_offset() branching, prior to commit 3ee16db390b4,
must be used only if passed 'chunk_sectors' override is zero.
Fixes: 3ee16db390b4 ("dm: fix IO splitting")
Cc: stable@vger.kernel.org # 5.9
Reported-by: John Dorminy <jdorminy@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
---
include/linux/blkdev.h | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 24ae504cf77d..033eb5f73b65 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1076,10 +1076,12 @@ static inline unsigned int blk_max_size_offset(struct request_queue *q,
sector_t offset,
unsigned int chunk_sectors)
{
- if (!chunk_sectors && q->limits.chunk_sectors)
- chunk_sectors = q->limits.chunk_sectors;
- else
- return q->limits.max_sectors;
+ if (!chunk_sectors) {
+ if (q->limits.chunk_sectors)
+ chunk_sectors = q->limits.chunk_sectors;
+ else
+ return q->limits.max_sectors;
+ }
if (likely(is_power_of_2(chunk_sectors)))
chunk_sectors -= offset & (chunk_sectors - 1);
--
2.15.0
--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [git pull] device mapper induced block fix for 5.10-rc7
2020-12-04 22:37 ` [dm-devel] " Mike Snitzer
@ 2020-12-04 23:12 ` Mike Snitzer
-1 siblings, 0 replies; 10+ messages in thread
From: Mike Snitzer @ 2020-12-04 23:12 UTC (permalink / raw)
To: Linus Torvalds; +Cc: dm-devel, linux-block, axboe
Hi Linus (and Jens),
Apologies for the glaring bug I introduced with my previous pull request!
The following changes since commit bde3808bc8c2741ad3d804f84720409aee0c2972:
dm: remove invalid sparse __acquires and __releases annotations (2020-12-04 15:25:18 -0500)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git tags/for-5.10/dm-fixes-2
for you to fetch changes up to 65f33b35722952fa076811d5686bfd8a611a80fa:
block: fix incorrect branching in blk_max_size_offset() (2020-12-04 17:27:42 -0500)
Please pull, thanks!
Mike
----------------------------------------------------------------
Fix incorrect branching at top of blk_max_size_offset().
----------------------------------------------------------------
Mike Snitzer (1):
block: fix incorrect branching in blk_max_size_offset()
include/linux/blkdev.h | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
^ permalink raw reply [flat|nested] 10+ messages in thread
* [dm-devel] [git pull] device mapper induced block fix for 5.10-rc7
@ 2020-12-04 23:12 ` Mike Snitzer
0 siblings, 0 replies; 10+ messages in thread
From: Mike Snitzer @ 2020-12-04 23:12 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-block, axboe, dm-devel
Hi Linus (and Jens),
Apologies for the glaring bug I introduced with my previous pull request!
The following changes since commit bde3808bc8c2741ad3d804f84720409aee0c2972:
dm: remove invalid sparse __acquires and __releases annotations (2020-12-04 15:25:18 -0500)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git tags/for-5.10/dm-fixes-2
for you to fetch changes up to 65f33b35722952fa076811d5686bfd8a611a80fa:
block: fix incorrect branching in blk_max_size_offset() (2020-12-04 17:27:42 -0500)
Please pull, thanks!
Mike
----------------------------------------------------------------
Fix incorrect branching at top of blk_max_size_offset().
----------------------------------------------------------------
Mike Snitzer (1):
block: fix incorrect branching in blk_max_size_offset()
include/linux/blkdev.h | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [dm-devel] [git pull] device mapper induced block fix for 5.10-rc7
2020-12-04 23:12 ` [dm-devel] " Mike Snitzer
@ 2020-12-05 19:21 ` pr-tracker-bot
-1 siblings, 0 replies; 10+ messages in thread
From: pr-tracker-bot @ 2020-12-05 19:21 UTC (permalink / raw)
To: Mike Snitzer; +Cc: Linus Torvalds, linux-block, axboe, dm-devel
The pull request you sent on Fri, 4 Dec 2020 18:12:26 -0500:
> git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git tags/for-5.10/dm-fixes-2
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/8762340561397fce0f0b41220ed9619101c870d0
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [dm-devel] [git pull] device mapper induced block fix for 5.10-rc7
@ 2020-12-05 19:21 ` pr-tracker-bot
0 siblings, 0 replies; 10+ messages in thread
From: pr-tracker-bot @ 2020-12-05 19:21 UTC (permalink / raw)
To: Mike Snitzer; +Cc: linux-block, axboe, dm-devel, Linus Torvalds
The pull request you sent on Fri, 4 Dec 2020 18:12:26 -0500:
> git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git tags/for-5.10/dm-fixes-2
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/8762340561397fce0f0b41220ed9619101c870d0
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2020-12-05 19:23 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-04 21:05 [git pull] device mapper fixes for 5.10-rc7 Mike Snitzer
2020-12-04 21:05 ` [dm-devel] " Mike Snitzer
2020-12-04 21:35 ` pr-tracker-bot
2020-12-04 21:35 ` [dm-devel] " pr-tracker-bot
2020-12-04 22:37 ` [PATCH] block: fix incorrect branching in blk_max_size_offset() [was: Re: [git pull] device mapper fixes for 5.10-rc7] Mike Snitzer
2020-12-04 22:37 ` [dm-devel] " Mike Snitzer
2020-12-04 23:12 ` [git pull] device mapper induced block fix for 5.10-rc7 Mike Snitzer
2020-12-04 23:12 ` [dm-devel] " Mike Snitzer
2020-12-05 19:21 ` pr-tracker-bot
2020-12-05 19:21 ` pr-tracker-bot
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.