Skip to contentSkip to conversation

FAILED: patch "[PATCH] dm integrity: fix flush with external metadata device" failed to apply to 4.19-stable tree

PATCH [email protected] 2 participants 3 messages Jan 17, 2021 – Jan 20, 2021

Subsystems (2)
Stable branch Device mapper
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 9b5948267adc9e689da609eb61cf7ed49cae5fa8 Mon Sep 17 00:00:00 2001
From: Mikulas Patocka <[email protected]>
Date: Fri, 8 Jan 2021 11:15:56 -0500
Subject: [PATCH] dm integrity: fix flush with external metadata device

With external metadata device, flush requests are not passed down to the data device.

Fix this by submitting the flush request in dm_integrity_flush_buffers. In order to not degrade performance, we overlap the data device flush with the metadata device flush.

Reported-by Lukas Straub <[email protected]>
Signed-off-by Mikulas Patocka <[email protected]>
Cc [email protected]
Signed-off-by Mike Snitzer <[email protected]>
drivers/md/dm-bufio.c +6 -0
index 9c1a86bde658..fce4cbf9529d 100644
@@ -1534,6 +1534,12 @@ sector_t dm_bufio_get_device_size(struct dm_bufio_client *c)
 }
 EXPORT_SYMBOL_GPL(dm_bufio_get_device_size);
 
+struct dm_io_client *dm_bufio_get_dm_io_client(struct dm_bufio_client *c)
+{
+	return c->dm_io;
+}
+EXPORT_SYMBOL_GPL(dm_bufio_get_dm_io_client);
+
 sector_t dm_bufio_get_block_number(struct dm_buffer *b)
 {
 	return b->block;
drivers/md/dm-integrity.c +49 -11

116 lines not on this page · raw message

include/linux/dm-bufio.h +1 -0
index 29d255fdd5d6..90bd558a17f5 100644
@@ -150,6 +150,7 @@ void dm_bufio_set_minimum_buffers(struct dm_bufio_client *c, unsigned n);
 
 unsigned dm_bufio_get_block_size(struct dm_bufio_client *c);
 sector_t dm_bufio_get_device_size(struct dm_bufio_client *c);
+struct dm_io_client *dm_bufio_get_dm_io_client(struct dm_bufio_client *c);
 sector_t dm_bufio_get_block_number(struct dm_buffer *b);
 void *dm_bufio_get_block_data(struct dm_buffer *b);
 void *dm_bufio_get_aux_data(struct dm_buffer *b);
maintainer
#1 lore raw
Quoted 9 lines · On Sun, 17 Jan 2021, [email protected] wrote:

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

Hi

Here I'm submitting the backported patch for the branch 4.19-stable:

upstream commit 9b5948267adc9e689da609eb61cf7ed49cae5fa8

Author: Mikulas Patocka <[email protected]>
Date:   Fri Jan 8 11:15:56 2021 -0500

dm integrity: fix flush with external metadata device

With external metadata device, flush requests are not passed down to the data device.

Fix this by submitting the flush request in dm_integrity_flush_buffers. In order to not degrade performance, we overlap the data device flush with the metadata device flush.

Reported-by Lukas Straub <[email protected]>
Signed-off-by Mikulas Patocka <[email protected]>
Cc [email protected]
Signed-off-by Mike Snitzer <[email protected]>
---
 drivers/md/dm-bufio.c     |    6 +++++
 drivers/md/dm-integrity.c |   50 +++++++++++++++++++++++++++++++++++++++++-----
 include/linux/dm-bufio.h  |    1 
 3 files changed, 52 insertions(+), 5 deletions(-)
drivers/md/dm-bufio.c +6 -0
Index: linux-stable/drivers/md/dm-bufio.c
===================================================================
@@ -1471,6 +1471,12 @@ sector_t dm_bufio_get_device_size(struct
 }
 EXPORT_SYMBOL_GPL(dm_bufio_get_device_size);
 
+struct dm_io_client *dm_bufio_get_dm_io_client(struct dm_bufio_client *c)
+{
+	return c->dm_io;
+}
+EXPORT_SYMBOL_GPL(dm_bufio_get_dm_io_client);
+
 sector_t dm_bufio_get_block_number(struct dm_buffer *b)
 {
 	return b->block;
drivers/md/dm-integrity.c +45 -5

85 lines not on this page · raw message

include/linux/dm-bufio.h +1 -0
Index: linux-stable/include/linux/dm-bufio.h
===================================================================
@@ -138,6 +138,7 @@ void dm_bufio_set_minimum_buffers(struct
 
 unsigned dm_bufio_get_block_size(struct dm_bufio_client *c);
 sector_t dm_bufio_get_device_size(struct dm_bufio_client *c);
+struct dm_io_client *dm_bufio_get_dm_io_client(struct dm_bufio_client *c);
 sector_t dm_bufio_get_block_number(struct dm_buffer *b);
 void *dm_bufio_get_block_data(struct dm_buffer *b);
 void *dm_bufio_get_aux_data(struct dm_buffer *b);
author maintainer
#2 lore raw
Quoted 10 lines · Mikulas Patocka
Quoted 6 lines · On Sun, 17 Jan 2021, [email protected] wrote:

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Quoted 7 lines
Quoted 3 lines

thanks,

greg k-h

Hi

Here I'm submitting the backported patch for the branch 4.19-stable:

Now queued up, thanks.

greg k-h