* [PATCH 7/9] dm-integrity: use version 2 for separate metadata
@ 2018-06-06 15:33 Mikulas Patocka
0 siblings, 0 replies; 2+ messages in thread
From: Mikulas Patocka @ 2018-06-06 15:33 UTC (permalink / raw)
To: Mike Snitzer, Milan Broz; +Cc: dm-devel, Mikulas Patocka
[-- Attachment #1: dm-integrity-sb-version.patch --]
[-- Type: text/plain, Size: 1901 bytes --]
Use version "2" in the superblock when data and metadata devices are
separate, so that the device is no accidentally read by older kernel
version.
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
---
drivers/md/dm-integrity.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
Index: linux-2.6/drivers/md/dm-integrity.c
===================================================================
--- linux-2.6.orig/drivers/md/dm-integrity.c 2018-06-06 17:08:23.000000000 +0200
+++ linux-2.6/drivers/md/dm-integrity.c 2018-06-06 17:08:23.000000000 +0200
@@ -44,7 +44,8 @@
*/
#define SB_MAGIC "integrt"
-#define SB_VERSION 1
+#define SB_VERSION_1 1
+#define SB_VERSION_2 2
#define SB_SECTORS 8
#define MAX_SECTORS_PER_BLOCK 8
@@ -414,6 +415,14 @@ static void wraparound_section(struct dm
*sec_ptr -= ic->journal_sections;
}
+static void sb_set_version(struct dm_integrity_c *ic)
+{
+ if (ic->meta_dev)
+ ic->sb->version = SB_VERSION_2;
+ else
+ ic->sb->version = SB_VERSION_1;
+}
+
static int sync_rw_sb(struct dm_integrity_c *ic, int op, int op_flags)
{
struct dm_io_request io_req;
@@ -2431,7 +2440,6 @@ static int initialize_superblock(struct
memset(ic->sb, 0, SB_SECTORS << SECTOR_SHIFT);
memcpy(ic->sb->magic, SB_MAGIC, 8);
- ic->sb->version = SB_VERSION;
ic->sb->integrity_tag_size = cpu_to_le16(ic->tag_size);
ic->sb->log2_sectors_per_block = __ffs(ic->sectors_per_block);
if (ic->journal_mac_alg.alg_string)
@@ -2488,6 +2496,8 @@ try_smaller_buffer:
ic->sb->provided_data_sectors = cpu_to_le64(ic->provided_data_sectors);
+ sb_set_version(ic);
+
return 0;
}
@@ -3185,7 +3195,7 @@ static int dm_integrity_ctr(struct dm_ta
should_write_sb = true;
}
- if (ic->sb->version != SB_VERSION) {
+ if (!ic->sb->version || ic->sb->version > SB_VERSION_2) {
r = -EINVAL;
ti->error = "Unknown version";
goto bad;
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 7/9] dm-integrity: use version 2 for separate metadata
@ 2018-07-03 18:13 Mikulas Patocka
0 siblings, 0 replies; 2+ messages in thread
From: Mikulas Patocka @ 2018-07-03 18:13 UTC (permalink / raw)
To: Milan Broz, Mike Snitzer; +Cc: dm-devel, Mikulas Patocka
[-- Attachment #1: dm-integrity-sb-version.patch --]
[-- Type: text/plain, Size: 1901 bytes --]
Use version "2" in the superblock when data and metadata devices are
separate, so that the device is no accidentally read by older kernel
version.
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
---
drivers/md/dm-integrity.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
Index: linux-2.6/drivers/md/dm-integrity.c
===================================================================
--- linux-2.6.orig/drivers/md/dm-integrity.c 2018-06-29 23:14:05.190000000 +0200
+++ linux-2.6/drivers/md/dm-integrity.c 2018-06-29 23:14:05.180000000 +0200
@@ -44,7 +44,8 @@
*/
#define SB_MAGIC "integrt"
-#define SB_VERSION 1
+#define SB_VERSION_1 1
+#define SB_VERSION_2 2
#define SB_SECTORS 8
#define MAX_SECTORS_PER_BLOCK 8
@@ -414,6 +415,14 @@ static void wraparound_section(struct dm
*sec_ptr -= ic->journal_sections;
}
+static void sb_set_version(struct dm_integrity_c *ic)
+{
+ if (ic->meta_dev)
+ ic->sb->version = SB_VERSION_2;
+ else
+ ic->sb->version = SB_VERSION_1;
+}
+
static int sync_rw_sb(struct dm_integrity_c *ic, int op, int op_flags)
{
struct dm_io_request io_req;
@@ -2435,7 +2444,6 @@ static int initialize_superblock(struct
memset(ic->sb, 0, SB_SECTORS << SECTOR_SHIFT);
memcpy(ic->sb->magic, SB_MAGIC, 8);
- ic->sb->version = SB_VERSION;
ic->sb->integrity_tag_size = cpu_to_le16(ic->tag_size);
ic->sb->log2_sectors_per_block = __ffs(ic->sectors_per_block);
if (ic->journal_mac_alg.alg_string)
@@ -2492,6 +2500,8 @@ try_smaller_buffer:
ic->sb->provided_data_sectors = cpu_to_le64(ic->provided_data_sectors);
+ sb_set_version(ic);
+
return 0;
}
@@ -3196,7 +3206,7 @@ static int dm_integrity_ctr(struct dm_ta
should_write_sb = true;
}
- if (ic->sb->version != SB_VERSION) {
+ if (!ic->sb->version || ic->sb->version > SB_VERSION_2) {
r = -EINVAL;
ti->error = "Unknown version";
goto bad;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-07-03 18:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-06 15:33 [PATCH 7/9] dm-integrity: use version 2 for separate metadata Mikulas Patocka
2018-07-03 18:13 Mikulas Patocka
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.