Skip to contentSkip to conversation

scsi_debug: improve num_parts usage

PATCH Superseded John Pittman 2 participants 5 messages Sep 2, 2020 – Sep 3, 2020 SCSI

lore
Share & tools
lore
#0 lore raw

v2 cover scsi_debug: improve num_parts usage

Hello,

The 1st patch sets all partitions to the same size when using the num_parts parameter.

The 2nd patch allows virtual_gb to be respected when it is passed at the same time as num_parts.

v1 -> v2
1. Fix multiple variable assignments on one line (style issue)

John Pittman (2):
scsi: scsi_debug: adjust num_parts to create equally sized partitions
scsi: scsi_debug: sdebug_build_parts() respect virtual_gb

 scsi_debug.c |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
Cc James Bottomley <[email protected]>
Cc Martin Petersen <[email protected]>
Cc Douglas Gilbert <[email protected]>
Cc David Jeffery <[email protected]>
Cc Laurence Oberman <[email protected]>
#1 lore raw

PATCH v2 1/2 scsi: scsi_debug: adjust num_parts to create equally sized partitions

Currently when using the num_parts parameter, partitions are aligned and the end sector is one prior to the next start. This creates different sized partitions. Create instead equally sized partitions by trimming the end of each partition to the size of the smallest partition. This aligns better with what one would expect from automatically created partitions and can be helpful with testing things such as raid which often expect legs of the same size. Minimal space is lost as the initial partition starting size is calculated by dividing num_sectors by sdebug_num_parts.

---
 drivers/scsi/scsi_debug.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/scsi/scsi_debug.c +7 -3
index 1ad7260d4758..ada0361eac83 100644
@@ -5257,7 +5257,7 @@ static int scsi_debug_host_reset(struct scsi_cmnd *SCpnt)
 static void sdebug_build_parts(unsigned char *ramp, unsigned long store_size)
 {
 	struct msdos_partition *pp;
-	int starts[SDEBUG_MAX_PARTS + 2];
+	int starts[SDEBUG_MAX_PARTS + 2], max_part_secs;
 	int sectors_per_part, num_sectors, k;
 	int heads_by_sects, start_sec, end_sec;
 
@@ -5273,9 +5273,13 @@ static void sdebug_build_parts(unsigned char *ramp, unsigned long store_size)
 			   / sdebug_num_parts;
 	heads_by_sects = sdebug_heads * sdebug_sectors_per;
 	starts[0] = sdebug_sectors_per;
-	for (k = 1; k < sdebug_num_parts; ++k)
+	max_part_secs = sectors_per_part;
+	for (k = 1; k < sdebug_num_parts; ++k) {
 		starts[k] = ((k * sectors_per_part) / heads_by_sects)
 			    * heads_by_sects;
+		if (starts[k] - starts[k - 1] < max_part_secs)
+			max_part_secs = starts[k] - starts[k - 1];
+	}
 	starts[sdebug_num_parts] = num_sectors;
 	starts[sdebug_num_parts + 1] = 0;
 
@@ -5284,7 +5288,7 @@ static void sdebug_build_parts(unsigned char *ramp, unsigned long store_size)
 	pp = (struct msdos_partition *)(ramp + 0x1be);
 	for (k = 0; starts[k + 1]; ++k, ++pp) {
 		start_sec = starts[k];
-		end_sec = starts[k + 1] - 1;
+		end_sec = starts[k] + max_part_secs - 1;
 		pp->boot_ind = 0;
 
 		pp->cyl = start_sec / heads_by_sects;
Signature · 1 line
2.17.2
Acked-by on v2 1/2
#2 lore raw

Re: [PATCH v2 1/2] scsi: scsi_debug: adjust num_parts to create equally sized partitions

Quoted 10 lines · John Pittman

Currently when using the num_parts parameter, partitions are aligned and the end sector is one prior to the next start. This creates different sized partitions. Create instead equally sized partitions by trimming the end of each partition to the size of the smallest partition. This aligns better with what one would expect from automatically created partitions and can be helpful with testing things such as raid which often expect legs of the same size. Minimal space is lost as the initial partition starting size is calculated by dividing num_sectors by sdebug_num_parts.

Quoted 43 lines
---
  drivers/scsi/scsi_debug.c | 10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)
drivers/scsi/scsi_debug.c +7 -3
index 1ad7260d4758..ada0361eac83 100644
@@ -5257,7 +5257,7 @@ static int scsi_debug_host_reset(struct scsi_cmnd *SCpnt)
  static void sdebug_build_parts(unsigned char *ramp, unsigned long store_size)
  {
  	struct msdos_partition *pp;
-	int starts[SDEBUG_MAX_PARTS + 2];
+	int starts[SDEBUG_MAX_PARTS + 2], max_part_secs;
  	int sectors_per_part, num_sectors, k;
  	int heads_by_sects, start_sec, end_sec;
 
@@ -5273,9 +5273,13 @@ static void sdebug_build_parts(unsigned char *ramp, unsigned long store_size)
  			   / sdebug_num_parts;
  	heads_by_sects = sdebug_heads * sdebug_sectors_per;
  	starts[0] = sdebug_sectors_per;
-	for (k = 1; k < sdebug_num_parts; ++k)
+	max_part_secs = sectors_per_part;
+	for (k = 1; k < sdebug_num_parts; ++k) {
  		starts[k] = ((k * sectors_per_part) / heads_by_sects)
  			    * heads_by_sects;
+		if (starts[k] - starts[k - 1] < max_part_secs)
+			max_part_secs = starts[k] - starts[k - 1];
+	}
  	starts[sdebug_num_parts] = num_sectors;
  	starts[sdebug_num_parts + 1] = 0;
 
@@ -5284,7 +5288,7 @@ static void sdebug_build_parts(unsigned char *ramp, unsigned long store_size)
  	pp = (struct msdos_partition *)(ramp + 0x1be);
  	for (k = 0; starts[k + 1]; ++k, ++pp) {
  		start_sec = starts[k];
-		end_sec = starts[k + 1] - 1;
+		end_sec = starts[k] + max_part_secs - 1;
  		pp->boot_ind = 0;
 
  		pp->cyl = start_sec / heads_by_sects;
#3 lore raw

PATCH v2 2/2 scsi: scsi_debug: sdebug_build_parts() respect virtual_gb

In reply to John Pittman

If virtual_gb is passed while using num_parts, when creating the partitions, virtual_gb is not respected. Set num_sectors using get_sdebug_capacity() to pull virtual_gb if set.

---
 drivers/scsi/scsi_debug.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/scsi_debug.c +1 -1
index ada0361eac83..a36652d41314 100644
@@ -5268,7 +5268,7 @@ static void sdebug_build_parts(unsigned char *ramp, unsigned long store_size)
 		sdebug_num_parts = SDEBUG_MAX_PARTS;
 		pr_warn("reducing partitions to %d\n", SDEBUG_MAX_PARTS);
 	}
-	num_sectors = (int)sdebug_store_sectors;
+	num_sectors = (int)get_sdebug_capacity();
 	sectors_per_part = (num_sectors - sdebug_sectors_per)
 			   / sdebug_num_parts;
 	heads_by_sects = sdebug_heads * sdebug_sectors_per;
Signature · 1 line
2.17.2
Acked-by on v2 2/2
#4 lore raw

Re: [PATCH v2 2/2] scsi: scsi_debug: sdebug_build_parts() respect virtual_gb

Quoted 4 lines · John Pittman

If virtual_gb is passed while using num_parts, when creating the partitions, virtual_gb is not respected. Set num_sectors using get_sdebug_capacity() to pull virtual_gb if set.

Quoted 19 lines
---
  drivers/scsi/scsi_debug.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/scsi_debug.c +1 -1
index ada0361eac83..a36652d41314 100644
@@ -5268,7 +5268,7 @@ static void sdebug_build_parts(unsigned char *ramp, unsigned long store_size)
  		sdebug_num_parts = SDEBUG_MAX_PARTS;
  		pr_warn("reducing partitions to %d\n", SDEBUG_MAX_PARTS);
  	}
-	num_sectors = (int)sdebug_store_sectors;
+	num_sectors = (int)get_sdebug_capacity();
  	sectors_per_part = (num_sectors - sdebug_sectors_per)
  			   / sdebug_num_parts;
  	heads_by_sects = sdebug_heads * sdebug_sectors_per;