dm-integrity: set discard_granularity to logical block size

Mikulas Patocka · Mike Snitzer · commit 69381cf88a8d · 2024-05-20T15:49:22.000-04:00
dm-integrity could set discard_granularity lower than the logical block
size. This could result in failures when sending discard requests to
dm-integrity.

This fix is needed for kernels prior to 6.10.

Signed-off-by: Mikulas Patocka &lt;mpatocka@redhat.com&gt;
Reported-by: Eric Wheeler &lt;linux-integrity@lists.ewheeler.net&gt;
Cc: stable@vger.kernel.org # &lt;= 6.9
Signed-off-by: Mike Snitzer &lt;snitzer@kernel.org&gt;
diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c
@@ -3492,6 +3492,7 @@ static void dm_integrity_io_hints(struct dm_target *ti, struct queue_limits *lim
 		limits->physical_block_size = ic->sectors_per_block << SECTOR_SHIFT;
 		blk_limits_io_min(limits, ic->sectors_per_block << SECTOR_SHIFT);
 		limits->dma_alignment = limits->logical_block_size - 1;
+		limits->discard_granularity = ic->sectors_per_block << SECTOR_SHIFT;
 	}
 	limits->max_integrity_segments = USHRT_MAX;
 }

Original file line number	Diff line number	Diff line change
`@@ -3492,6 +3492,7 @@ static void dm_integrity_io_hints(struct dm_target ti, struct queue_limits lim`
`3492`	`3492`	`limits->physical_block_size = ic->sectors_per_block << SECTOR_SHIFT;`
`3493`	`3493`	`blk_limits_io_min(limits, ic->sectors_per_block << SECTOR_SHIFT);`
`3494`	`3494`	`limits->dma_alignment = limits->logical_block_size - 1;`
	`3495`	`+ limits->discard_granularity = ic->sectors_per_block << SECTOR_SHIFT;`
`3495`	`3496`	`}`
`3496`	`3497`	`limits->max_integrity_segments = USHRT_MAX;`
`3497`	`3498`	`}`