TheCloud/f3
1
0
Fork 0
mirror of https://github.com/AltraMayor/f3.git synced 2025-09-09 23:27:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

f3probe: align buffers with devices' block sizes

Browse Source 
This patch should address issue discussed here:
https://github.com/AltraMayor/f3/issues/13

Reported-by: Dingyuan Wang
This commit is contained in:
Michel Machado 2015-02-14 10:36:07 -05:00
parent 4f13815dfc
commit 902db294ef
5 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
f3brew.c
View File

@ -140,9 +140,10 @@ static void read_blocks(char *probe_blk, struct device *dev,
static void write_and_read_blocks(struct device *dev, static void write_and_read_blocks(struct device *dev,
uint64_t first_block, uint64_t last_block) uint64_t first_block, uint64_t last_block)
{ {
const int block_order = dev_get_block_order(dev);
const int block_size = dev_get_block_size(dev); const int block_size = dev_get_block_size(dev);
char stack[511 + block_size]; char stack[align_head(block_order) + block_size];
char *blk = align_512(stack); char *blk = align_mem(stack, block_order);
printf("Writing blocks from 0x%" PRIx64 " to 0x%" PRIx64 "...", printf("Writing blocks from 0x%" PRIx64 " to 0x%" PRIx64 "...",
first_block, last_block); first_block, last_block);

11
libdevs.c
View File

@ -1029,7 +1029,7 @@ static int sdev_save_block(struct safe_device *sdev,
/* The block at @offset hasn't been saved before. Save this block. */ /* The block at @offset hasn't been saved before. Save this block. */
assert(sdev->sb_n < sdev->sb_max); assert(sdev->sb_n < sdev->sb_max);
block = (char *)align_512(sdev->saved_blocks) + block = (char *)align_mem(sdev->saved_blocks, block_order) +
(sdev->sb_n << block_order); (sdev->sb_n << block_order);
rc = sdev->shadow_dev->read_block(sdev->shadow_dev, block, rc = sdev->shadow_dev->read_block(sdev->shadow_dev, block,
length, offset); length, offset);
@ -1068,10 +1068,9 @@ static void sdev_free(struct device *dev)
struct safe_device *sdev = dev_sdev(dev); struct safe_device *sdev = dev_sdev(dev);
if (sdev->sb_n > 0) { if (sdev->sb_n > 0) {
char *first_block = align_512(sdev->saved_blocks); const int block_order = dev_get_block_order(sdev->shadow_dev);
char *block = first_block + char *first_block = align_mem(sdev->saved_blocks, block_order);
((sdev->sb_n - 1) << char *block = first_block + ((sdev->sb_n - 1) << block_order);
dev_get_block_order(sdev->shadow_dev));
uint64_t *poffset = &sdev->sb_offsets[sdev->sb_n - 1]; uint64_t *poffset = &sdev->sb_offsets[sdev->sb_n - 1];
int block_size = dev_get_block_size(sdev->shadow_dev); int block_size = dev_get_block_size(sdev->shadow_dev);
@ -1114,7 +1113,7 @@ struct device *create_safe_device(struct device *dev, int max_blocks,
if (!sdev) if (!sdev)
goto error; goto error;
length = 511 + (max_blocks << block_order); length = align_head(block_order) + (max_blocks << block_order);
sdev->saved_blocks = malloc(length); sdev->saved_blocks = malloc(length);
if (!sdev->saved_blocks) if (!sdev->saved_blocks)
goto sdev; goto sdev;

4
libprobe.c
View File

@ -339,7 +339,7 @@ int probe_device(struct device *dev, uint64_t *preal_size_byte,
uint64_t dev_size_byte = dev_get_size_byte(dev); uint64_t dev_size_byte = dev_get_size_byte(dev);
const int block_size = dev_get_block_size(dev); const int block_size = dev_get_block_size(dev);
const int block_order = dev_get_block_order(dev); const int block_order = dev_get_block_order(dev);
char stack[511 + (2 << block_order)]; char stack[align_head(block_order) + (2 << block_order)];
char *stamp_blk, *probe_blk; char *stamp_blk, *probe_blk;
/* XXX Don't write at the very beginning of the card to avoid /* XXX Don't write at the very beginning of the card to avoid
* losing the partition table. * losing the partition table.
@ -362,7 +362,7 @@ int probe_device(struct device *dev, uint64_t *preal_size_byte,
* the block device. * the block device.
* For the file device, this is superfluous. * For the file device, this is superfluous.
*/ */
stamp_blk = align_512(stack); stamp_blk = align_mem(stack, block_order);
probe_blk = stamp_blk + block_size; probe_blk = stamp_blk + block_size;
fill_buffer(stamp_blk, block_size); fill_buffer(stamp_blk, block_size);

7
libutils.c
View File

@ -39,3 +39,10 @@ int ceiling_log2(uint64_t x)
{ {
return ilog2(clp2(x)); return ilog2(clp2(x));
} }
void *align_mem(void *p, int order)
{
uintptr_t ip = (uintptr_t)p;
uintptr_t head = align_head(order);
return (void *)( (ip + head) & ~head );
}

7
libutils.h
View File

@ -6,10 +6,11 @@
int ilog2(uint64_t x); int ilog2(uint64_t x);
int ceiling_log2(uint64_t x); int ceiling_log2(uint64_t x);
static inline void *align_512(void *p) static inline int align_head(int order)
{ {
uintptr_t ip = (uintptr_t)p; return (1 << order) - 1;
return (void *)( (ip + 511) & ~511 );
} }
void *align_mem(void *p, int order);
#endif /* HEADER_LIBUTILS_H */ #endif /* HEADER_LIBUTILS_H */