Skip to contentSkip to conversation

device mapper fixes for 5.19-rc1

GIT PULL Merged Mike Snitzer 3 participants 4 messages Jun 1, 2022

Subsystems (2)
lore
Share & tools
lore

Mike Snitzer

author maintainer
#0 lore raw

Hi Linus,

The following changes since commit ca522482e3eafd005b8d4e8b1331c911505a58d5:

dm: pass NULL bdev to bio_alloc_clone (2022-05-11 13:58:52 -0400)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git tags/for-5.19/dm-fixes

for you to fetch changes up to 4caae58406f8ceb741603eee460d79bacca9b1b5:

dm verity: set DM_TARGET_IMMUTABLE feature flag (2022-05-31 16:22:30 -0400)

Please pull, thanks.
Mike

----------------------------------------------------------------
- Fix DM core's dm_table_supports_poll to return false if no data devices.

- Fix DM verity target so that it cannot be switched to a different DM target type (e.g. dm-linear) via DM table reload.

----------------------------------------------------------------
Mike Snitzer (1):
dm table: fix dm_table_supports_poll to return false if no data devices

Sarthak Kukreti (1):
dm verity: set DM_TARGET_IMMUTABLE feature flag

 drivers/md/dm-table.c         | 19 +++++++++++++++----
 drivers/md/dm-verity-target.c |  1 +
 2 files changed, 16 insertions(+), 4 deletions(-)
#1 lore raw
Quoted 4 lines · Mike Snitzer

----------------------------------------------------------------
- Fix DM core's dm_table_supports_poll to return false if no data devices.

So looking at that one (mainly because of the incomprehensible explanation), I do note:

(a) the caller does

        for (i = 0; i < t->num_targets; i++) {
                ti = t->targets + i;

    while the callee does

        unsigned i = 0;

        while (i < dm_table_get_num_targets(t)) {
                ti = dm_table_get_target(t, i++);

Now, those things are entirely equivalent, but that latter form is likely to generate horribly bad code because those helper functions aren't some kind of trivial inline, they are actually normal functions that are defined later in that same source file.

Maybe a compiler will do optimizations within that source file even for functions that haven't been defined yet. Traditionally not.

Whatever. Probably not a case where anybody cares about performance, but it does strike me that the "use abstractions" version probably not only generates worse code, it seems less legible too.

Very odd pattern.

(b) The commit message (which is why I started looking at this) says
that it used to return true even if there are no data devices.

But dm_table_supports_poll() actually _still_ returns true for at
least one case of no data devices: if the dm_table has no targets at all.

So I don't know. Maybe that is a "can't happen". But since I looked at this, I thought I'd just point out the two oddities I found while doing so.

Linus

author maintainer
#2 lore raw
Quoted 21 lines · Linus Torvalds
Quoted 4 lines · Mike Snitzer

----------------------------------------------------------------
- Fix DM core's dm_table_supports_poll to return false if no data devices.

So looking at that one (mainly because of the incomprehensible explanation), I do note:

(a) the caller does

        for (i = 0; i < t->num_targets; i++) {
                ti = t->targets + i;

    while the callee does

        unsigned i = 0;

        while (i < dm_table_get_num_targets(t)) {
                ti = dm_table_get_target(t, i++);
Quoted 4 lines

Now, those things are entirely equivalent, but that latter form is likely to generate horribly bad code because those helper functions aren't some kind of trivial inline, they are actually normal functions that are defined later in that same source file.

Yes, that needs fixing.. but not urgently so.

Quoted 8 lines

Maybe a compiler will do optimizations within that source file even for functions that haven't been defined yet. Traditionally not.

Whatever. Probably not a case where anybody cares about performance, but it does strike me that the "use abstractions" version probably not only generates worse code, it seems less legible too.

Very odd pattern.

OK, I can just nuke those wrappers. But yeah, none of this setup code is fast path.

Quoted 6 lines

(b) The commit message (which is why I started looking at this) says
that it used to return true even if there are no data devices.

But dm_table_supports_poll() actually _still_ returns true for at
least one case of no data devices: if the dm_table has no targets at all.

Right, I'm aware.. ugly but not a case that really matters (more below).

Quoted 3 lines

So I don't know. Maybe that is a "can't happen". But since I looked at this, I thought I'd just point out the two oddities I found while doing so.

It can happen that someone loads a table without any targets but it isn't a case that matters given IO cannot be sent anywhere. For that to happen the DM table will have been reloaded to have targets (at which point all will be setup properly, assuming no bugs like was fixed here).

I do see you've since pulled the changes.

Thanks,
Mike

merge bot Merged
#3 lore raw
In reply to Mike Snitzer
The pull request you sent on Wed, 1 Jun 2022 16:59:46 -0400:

The pull request you sent on Wed, 1 Jun 2022 16:59:46 -0400:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git tags/for-5.19/dm-fixes

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/fa78526accfd68966fb50a429439e9085f9c88d6

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html