Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fix from James Bottomley:
"Fix to zone block devices to make the maximum segment count match what
the block layer is capable of"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: sd_zbc: block: Respect bio vector limits for REPORT ZONES buffer
+7
-2
+1
-1
block/bio.c
+1
-1
block/bio.c
+5
-1
drivers/scsi/sd_zbc.c
+5
-1
drivers/scsi/sd_zbc.c
···
169
169
unsigned int nr_zones, size_t *buflen)
170
170
{
171
171
struct request_queue *q = sdkp->disk->queue;
172
+
unsigned int max_segments;
172
173
size_t bufsize;
173
174
void *buf;
174
175
···
181
180
* Furthermore, since the report zone command cannot be split, make
182
181
* sure that the allocated buffer can always be mapped by limiting the
183
182
* number of pages allocated to the HBA max segments limit.
183
+
* Since max segments can be larger than the max inline bio vectors,
184
+
* further limit the allocated buffer to BIO_MAX_INLINE_VECS.
184
185
*/
185
186
nr_zones = min(nr_zones, sdkp->zone_info.nr_zones);
186
187
bufsize = roundup((nr_zones + 1) * 64, SECTOR_SIZE);
187
188
bufsize = min_t(size_t, bufsize,
188
189
queue_max_hw_sectors(q) << SECTOR_SHIFT);
189
-
bufsize = min_t(size_t, bufsize, queue_max_segments(q) << PAGE_SHIFT);
190
+
max_segments = min(BIO_MAX_INLINE_VECS, queue_max_segments(q));
191
+
bufsize = min_t(size_t, bufsize, max_segments << PAGE_SHIFT);
190
192
191
193
while (bufsize >= SECTOR_SIZE) {
192
194
buf = kvzalloc(bufsize, GFP_KERNEL | __GFP_NORETRY);