Skip to contentSkip to conversation

target/core: Use sg_alloc_table() instead of open-coding it

PATCH In review Bart Van Assche 2 participants 5 messages Sep 17, 2018 – Oct 8, 2018 SCSI target

lore
Share & tools
lore
#0 lore raw

PATCH 6/17 target/core: Use sg_alloc_table() instead of open-coding it

The purpose of sg_alloc_table() is to allocate and initialize an sg-list. Use that function instead of open-coding it.

Cc Nicholas Bellinger <[email protected]>
Cc Mike Christie <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Hannes Reinecke <[email protected]>
---
 drivers/target/target_core_sbc.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/target/target_core_sbc.c +5 -6
index ebac2b49b9c6..689ba6da9a0f 100644
@@ -453,7 +453,8 @@ static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool succes
 						 int *post_ret)
 {
 	struct se_device *dev = cmd->se_dev;
-	struct scatterlist *write_sg = NULL, *sg;
+	struct sg_table write_tbl = { };
+	struct scatterlist *write_sg, *sg;
 	unsigned char *buf = NULL, *addr;
 	struct sg_mapping_iter m;
 	unsigned int offset = 0, len;
@@ -494,14 +495,12 @@ static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool succes
 		goto out;
 	}
 
-	write_sg = kmalloc_array(cmd->t_data_nents, sizeof(*write_sg),
-				 GFP_KERNEL);
-	if (!write_sg) {
+	if (sg_alloc_table(&write_tbl, cmd->t_data_nents, GFP_KERNEL) < 0) {
 		pr_err("Unable to allocate compare_and_write sg\n");
 		ret = TCM_OUT_OF_RESOURCES;
 		goto out;
 	}
-	sg_init_table(write_sg, cmd->t_data_nents);
+	write_sg = write_tbl.sgl;
 	/*
 	 * Setup verify and write data payloads from total NumberLBAs.
 	 */
@@ -597,7 +596,7 @@ static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool succes
 	 * sbc_compare_and_write() before the original READ I/O submission.
 	 */
 	up(&dev->caw_sem);
-	kfree(write_sg);
+	sg_free_table(&write_tbl);
 	kfree(buf);
 	return ret;
 }
Signature · 1 line
2.18.0
#1 lore raw
Quoted 2 lines · Bart Van Assche

The purpose of sg_alloc_table() is to allocate and initialize an sg-list. Use that function instead of open-coding it.

Hmm. This looks correct, but what is the point if we don't plan on using chained sg-lists?

#2 lore raw
In reply to Bart Van Assche
Quoted 6 lines · Christoph Hellwig
Quoted 2 lines · Bart Van Assche

The purpose of sg_alloc_table() is to allocate and initialize an sg-list. Use that function instead of open-coding it.

Hmm. This looks correct, but what is the point if we don't plan on using chained sg-lists?

This patch makes it easier to replace the SCSI target sg-list allocation code by (library) code that caches sg-list allocations. I still hope to find some time to work on this.

Since the rest of this series does not depend on this patch, I can leave it out if you want.

Bart.

#3 lore raw
In reply to Bart Van Assche
Quoted 11 lines · Bart Van Assche
Quoted 6 lines · Christoph Hellwig
Quoted 2 lines · Bart Van Assche

The purpose of sg_alloc_table() is to allocate and initialize an sg-list. Use that function instead of open-coding it.

Hmm. This looks correct, but what is the point if we don't plan on using chained sg-lists?

This patch makes it easier to replace the SCSI target sg-list allocation code by (library) code that caches sg-list allocations. I still hope to find some time to work on this.

Ok.

Quoted 2 lines

Since the rest of this series does not depend on this patch, I can leave it out if you want.

Maybe just update the changelog to explain this better?