Skip to content

Commit

Permalink
target/rd: T10-Dif: RAM disk is allocating more space than required.
Browse files Browse the repository at this point in the history
Ram disk is allocating 8x more space than required for diff data.
For large RAM disk test, there is small potential for memory
starvation.

(Use block_size when calculating total_sg_needed - sagi + nab)

Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Quinn Tran <quinn.tran@qlogic.com>
Cc: <stable@vger.kernel.org> #3.14+
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
  • Loading branch information
Quinn Tran authored and Nicholas Bellinger committed Apr 7, 2014
1 parent d444edc commit 9d2e59f
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions drivers/target/target_core_rd.c
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ static void rd_release_prot_space(struct rd_dev *rd_dev)
rd_dev->sg_prot_count = 0;
}

static int rd_build_prot_space(struct rd_dev *rd_dev, int prot_length)
static int rd_build_prot_space(struct rd_dev *rd_dev, int prot_length, int block_size)
{
struct rd_dev_sg_table *sg_table;
u32 total_sg_needed, sg_tables;
Expand All @@ -252,8 +252,13 @@ static int rd_build_prot_space(struct rd_dev *rd_dev, int prot_length)

if (rd_dev->rd_flags & RDF_NULLIO)
return 0;

total_sg_needed = rd_dev->rd_page_count / prot_length;
/*
* prot_length=8byte dif data
* tot sg needed = rd_page_count * (PGSZ/block_size) *
* (prot_length/block_size) + pad
* PGSZ canceled each other.
*/
total_sg_needed = (rd_dev->rd_page_count * prot_length / block_size) + 1;

sg_tables = (total_sg_needed / max_sg_per_table) + 1;

Expand Down Expand Up @@ -606,7 +611,8 @@ static int rd_init_prot(struct se_device *dev)
if (!dev->dev_attrib.pi_prot_type)
return 0;

return rd_build_prot_space(rd_dev, dev->prot_length);
return rd_build_prot_space(rd_dev, dev->prot_length,
dev->dev_attrib.block_size);
}

static void rd_free_prot(struct se_device *dev)
Expand Down

0 comments on commit 9d2e59f

Please sign in to comment.