summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
1570788)
Trying some different ideas for handling free space cleaner.
Signed-off-by: Charles Manning <cdhmanning@gmail.com>
yaffs2-objs += yaffs_yaffs1.o
yaffs2-objs += yaffs_yaffs2.o
yaffs2-objs += yaffs_verify.o
yaffs2-objs += yaffs_yaffs1.o
yaffs2-objs += yaffs_yaffs2.o
yaffs2-objs += yaffs_verify.o
+ yaffs2-objs += yaffs_summary.o
yaffs2multi-objs := yaffs_mtdif.o yaffs_mtdif2_multi.o
yaffs2multi-objs += yaffs_mtdif1_multi.o yaffs_packedtags1.o
yaffs2multi-objs := yaffs_mtdif.o yaffs_mtdif2_multi.o
yaffs2multi-objs += yaffs_mtdif1_multi.o yaffs_packedtags1.o
yaffs2multi-objs += yaffs_yaffs1.o
yaffs2multi-objs += yaffs_yaffs2.o
yaffs2multi-objs += yaffs_verify.o
yaffs2multi-objs += yaffs_yaffs1.o
yaffs2multi-objs += yaffs_yaffs2.o
yaffs2multi-objs += yaffs_verify.o
+ yaffs2multi-objs += yaffs_summary.o
else
KERNELDIR ?= /lib/modules/$(shell uname -r)/build
else
KERNELDIR ?= /lib/modules/$(shell uname -r)/build
bi->has_shrink_hdr = 0;
bi->skip_erased_check = 1; /* Clean, so no need to check */
bi->gc_prioritise = 0;
bi->has_shrink_hdr = 0;
bi->skip_erased_check = 1; /* Clean, so no need to check */
bi->gc_prioritise = 0;
yaffs_clear_chunk_bits(dev, block_no);
yaffs_trace(YAFFS_TRACE_ERASE, "Erased block %d", block_no);
yaffs_clear_chunk_bits(dev, block_no);
yaffs_trace(YAFFS_TRACE_ERASE, "Erased block %d", block_no);
+ yaffs_summary_gc(dev, block);
+
if (is_checkpt_block || !yaffs_still_some_chunks(dev, block)) {
yaffs_trace(YAFFS_TRACE_TRACING,
"Collecting block %d that has no chunks in use",
if (is_checkpt_block || !yaffs_still_some_chunks(dev, block)) {
yaffs_trace(YAFFS_TRACE_TRACING,
"Collecting block %d that has no chunks in use",
if (!init_failed && !yaffs_create_initial_dir(dev))
init_failed = 1;
if (!init_failed && !yaffs_create_initial_dir(dev))
init_failed = 1;
- if(!init_failed && dev->param.is_yaffs2 && !yaffs_summary_init(dev))
+ if(!init_failed && dev->param.is_yaffs2 &&
+ !dev->param.disable_summary &&
+ !yaffs_summary_init(dev))
init_failed = 1;
if (!init_failed) {
init_failed = 1;
if (!init_failed) {
Block should be prioritised for GC */
u32 chunk_error_strikes:3; /* How many times we've had ecc etc
failures on this block and tried to reuse it */
Block should be prioritised for GC */
u32 chunk_error_strikes:3; /* How many times we've had ecc etc
failures on this block and tried to reuse it */
+ u32 has_summary:1; /* The block has a summary */
#ifdef CONFIG_YAFFS_YAFFS2
u32 has_shrink_hdr:1; /* This block has at least one shrink header */
#ifdef CONFIG_YAFFS_YAFFS2
u32 has_shrink_hdr:1; /* This block has at least one shrink header */
int auto_unicode;
#endif
int always_check_erased; /* Force chunk erased check always on */
int auto_unicode;
#endif
int always_check_erased; /* Force chunk erased check always on */
unsigned gc_block;
unsigned gc_chunk;
unsigned gc_skip;
unsigned gc_block;
unsigned gc_chunk;
unsigned gc_skip;
+ struct yaffs_summary_tags *gc_sum_tags;
/* Special directories */
struct yaffs_obj *root_dir;
/* Special directories */
struct yaffs_obj *root_dir;
int chunks_per_summary;
struct yaffs_summary_tags *sum_tags;
int chunks_per_summary;
struct yaffs_summary_tags *sum_tags;
u32 n_page_writes;
u32 n_page_reads;
u32 n_erasures;
u32 n_page_writes;
u32 n_page_reads;
u32 n_erasures;
u32 n_unmarked_deletions;
u32 refresh_count;
u32 cache_hits;
u32 n_unmarked_deletions;
u32 refresh_count;
u32 cache_hits;
+ u32 tags_used;
+ u32 summary_used;
*
* Chunks holding summaries are marked with tags making it look like
* they are part of a fake file.
*
* Chunks holding summaries are marked with tags making it look like
* they are part of a fake file.
+ *
+ * The chunks that hold the summary are removed from free space and are marked
+ * as being in use.
+ *
+ * THa above might need to be revisited.
*/
#include "yaffs_summary.h"
#include "yaffs_packedtags2.h"
#include "yaffs_nand.h"
*/
#include "yaffs_summary.h"
#include "yaffs_packedtags2.h"
#include "yaffs_nand.h"
+#include "yaffs_getblockinfo.h"
+#include "yaffs_bitmap.h"
/* Summary tags don't need the sequence number becase that is redundant. */
struct yaffs_summary_tags {
/* Summary tags don't need the sequence number becase that is redundant. */
struct yaffs_summary_tags {
int yaffs_summary_init(struct yaffs_dev *dev)
{
int yaffs_summary_init(struct yaffs_dev *dev)
{
- struct yaffs_summary_tags *sum;
int sum_bytes;
int chunks_used; /* Number of chunks used by summary */
int sum_bytes;
int chunks_used; /* Number of chunks used by summary */
chunks_used = (sum_bytes + dev->data_bytes_per_chunk - 1)/
dev->data_bytes_per_chunk;
dev->chunks_per_summary = dev->param.chunks_per_block - chunks_used;
chunks_used = (sum_bytes + dev->data_bytes_per_chunk - 1)/
dev->data_bytes_per_chunk;
dev->chunks_per_summary = dev->param.chunks_per_block - chunks_used;
- sum = kmalloc(sizeof(struct yaffs_summary_tags) *
+ dev->sum_tags = kmalloc(sizeof(struct yaffs_summary_tags) *
dev->chunks_per_summary, GFP_NOFS);
dev->chunks_per_summary, GFP_NOFS);
+ dev->gc_sum_tags = kmalloc(sizeof(struct yaffs_summary_tags) *
+ dev->chunks_per_summary, GFP_NOFS);
+ if(!dev->sum_tags || !dev->gc_sum_tags) {
+ kfree(dev->sum_tags);
+ kfree(dev->gc_sum_tags);
yaffs_summary_clear(dev);
return YAFFS_OK;
yaffs_summary_clear(dev);
return YAFFS_OK;
void yaffs_summary_deinit(struct yaffs_dev *dev)
{
void yaffs_summary_deinit(struct yaffs_dev *dev)
{
- if(dev->sum_tags) {
- kfree(dev->sum_tags);
- dev->sum_tags = NULL;
- }
+ kfree(dev->sum_tags);
+ dev->sum_tags = NULL;
+ kfree(dev->sum_tags);
+ dev->sum_tags = NULL;
dev->chunks_per_summary = 0;
}
dev->chunks_per_summary = 0;
}
-static int yaffs_summary_write(struct yaffs_dev *dev)
+static int yaffs_summary_write(struct yaffs_dev *dev, int blk)
{
struct yaffs_ext_tags tags;
u8 *buffer;
u8 *sum_buffer = (u8 *)dev->sum_tags;
int n_bytes;
int chunk_in_nand;
{
struct yaffs_ext_tags tags;
u8 *buffer;
u8 *sum_buffer = (u8 *)dev->sum_tags;
int n_bytes;
int chunk_in_nand;
+ struct yaffs_block_info *bi = yaffs_get_block_info(dev, blk);
buffer = yaffs_get_temp_buffer(dev);
n_bytes = sizeof(struct yaffs_summary_tags) * dev->chunks_per_summary;
memset(&tags, 0, sizeof(struct yaffs_ext_tags));
tags.obj_id = YAFFS_OBJECTID_SUMMARY;
tags.chunk_id = 1;
buffer = yaffs_get_temp_buffer(dev);
n_bytes = sizeof(struct yaffs_summary_tags) * dev->chunks_per_summary;
memset(&tags, 0, sizeof(struct yaffs_ext_tags));
tags.obj_id = YAFFS_OBJECTID_SUMMARY;
tags.chunk_id = 1;
+ chunk_in_block = dev-> chunks_per_summary;
chunk_in_nand = dev->alloc_block * dev->param.chunks_per_block +
dev-> chunks_per_summary;
do {
chunk_in_nand = dev->alloc_block * dev->param.chunks_per_block +
dev-> chunks_per_summary;
do {
tags.n_bytes = this_tx;
result = yaffs_wr_chunk_tags_nand(dev, chunk_in_nand,
buffer, &tags);
tags.n_bytes = this_tx;
result = yaffs_wr_chunk_tags_nand(dev, chunk_in_nand,
buffer, &tags);
+
+ if (result != YAFFS_OK)
+ break;
+ yaffs_set_chunk_bit(dev, blk, chunk_in_block);
+ bi->pages_in_use++;
+ dev->n_free_chunks--;
+
n_bytes -= this_tx;
sum_buffer += this_tx;
chunk_in_nand++;
n_bytes -= this_tx;
sum_buffer += this_tx;
chunk_in_nand++;
} while (result == YAFFS_OK && n_bytes > 0);
yaffs_release_temp_buffer(dev, buffer);
} while (result == YAFFS_OK && n_bytes > 0);
yaffs_release_temp_buffer(dev, buffer);
+
+
+ if (result == YAFFS_OK)
+ bi->has_summary = 1;
+
+
-int yaffs_summary_read(struct yaffs_dev *dev, int blk)
+int yaffs_summary_read(struct yaffs_dev *dev,
+ struct yaffs_summary_tags *st,
+ int blk)
{
struct yaffs_ext_tags tags;
u8 *buffer;
{
struct yaffs_ext_tags tags;
u8 *buffer;
- u8 *sum_buffer = (u8 *)dev->sum_tags;
+ u8 *sum_buffer = (u8 *)st;
int n_bytes;
int chunk_id;
int chunk_in_nand;
int n_bytes;
int chunk_id;
int chunk_in_nand;
+ struct yaffs_block_info *bi = yaffs_get_block_info(dev, blk);
buffer = yaffs_get_temp_buffer(dev);
n_bytes = sizeof(struct yaffs_summary_tags) * dev->chunks_per_summary;
buffer = yaffs_get_temp_buffer(dev);
n_bytes = sizeof(struct yaffs_summary_tags) * dev->chunks_per_summary;
+ chunk_in_block = dev->chunks_per_summary;
chunk_in_nand = blk * dev->param.chunks_per_block +
dev->chunks_per_summary;
chunk_id = 1;
chunk_in_nand = blk * dev->param.chunks_per_block +
dev->chunks_per_summary;
chunk_id = 1;
if (result != YAFFS_OK)
break;
if (result != YAFFS_OK)
break;
+ if (st == dev->sum_tags) {
+ /* If we're scanning then update the block info */
+ yaffs_set_chunk_bit(dev, blk, chunk_in_block);
+ bi->pages_in_use++;
+ }
+
memcpy(sum_buffer, buffer, this_tx);
n_bytes -= this_tx;
sum_buffer += this_tx;
chunk_in_nand++;
memcpy(sum_buffer, buffer, this_tx);
n_bytes -= this_tx;
sum_buffer += this_tx;
chunk_in_nand++;
} while (result == YAFFS_OK && n_bytes > 0);
yaffs_release_temp_buffer(dev, buffer);
} while (result == YAFFS_OK && n_bytes > 0);
yaffs_release_temp_buffer(dev, buffer);
+
+ if (st == dev->sum_tags && result == YAFFS_OK)
+ bi->has_summary = 1;
+
return result;
}
int yaffs_summary_add(struct yaffs_dev *dev,
return result;
}
int yaffs_summary_add(struct yaffs_dev *dev,
{
struct yaffs_packed_tags2_tags_only tags_only;
struct yaffs_summary_tags *sum_tags;
{
struct yaffs_packed_tags2_tags_only tags_only;
struct yaffs_summary_tags *sum_tags;
+ int block_in_nand = chunk_in_nand / dev->param.chunks_per_block;
int chunk_in_block = chunk_in_nand % dev->param.chunks_per_block;
if(!dev->sum_tags)
return YAFFS_OK;
int chunk_in_block = chunk_in_nand % dev->param.chunks_per_block;
if(!dev->sum_tags)
return YAFFS_OK;
- printf("Add summary for chunk %d tags (%d %d %d)",chunk_in_block,
- tags->seq_number, tags->obj_id, tags->chunk_id);
if(chunk_in_block >= 0 && chunk_in_block < dev->chunks_per_summary) {
yaffs_pack_tags2_tags_only(&tags_only, tags);
sum_tags = &dev->sum_tags[chunk_in_block];
sum_tags->chunk_id = tags_only.chunk_id;
sum_tags->n_bytes = tags_only.n_bytes;
sum_tags->obj_id = tags_only.obj_id;
if(chunk_in_block >= 0 && chunk_in_block < dev->chunks_per_summary) {
yaffs_pack_tags2_tags_only(&tags_only, tags);
sum_tags = &dev->sum_tags[chunk_in_block];
sum_tags->chunk_id = tags_only.chunk_id;
sum_tags->n_bytes = tags_only.n_bytes;
sum_tags->obj_id = tags_only.obj_id;
- printf(" added %d %d %d", sum_tags->obj_id, sum_tags->chunk_id, sum_tags->n_bytes);
if(chunk_in_block == dev->chunks_per_summary - 1) {
if(chunk_in_block == dev->chunks_per_summary - 1) {
- printf(" Write summary");
/* Time to write out the summary */
/* Time to write out the summary */
- yaffs_summary_write(dev);
+ yaffs_summary_write(dev, block_in_nand);
yaffs_summary_clear(dev);
yaffs_skip_rest_of_block(dev);
}
}
yaffs_summary_clear(dev);
yaffs_skip_rest_of_block(dev);
}
}
+
+void yaffs_summary_gc(struct yaffs_dev *dev, int blk)
+{
+ struct yaffs_block_info *bi = yaffs_get_block_info(dev, blk);
+ int i;
+
+ if (!bi->has_summary)
+ return;
+
+ for (i = dev->chunks_per_summary; i < dev->param.chunks_per_block; i++)
+ yaffs_clear_chunk_bit(dev, blk, i);
+}
int yaffs_summary_fetch(struct yaffs_dev *dev,
struct yaffs_ext_tags *tags,
int chunk_in_block);
int yaffs_summary_fetch(struct yaffs_dev *dev,
struct yaffs_ext_tags *tags,
int chunk_in_block);
-int yaffs_summary_read(struct yaffs_dev *dev, int blk);
+int yaffs_summary_read(struct yaffs_dev *dev,
+ struct yaffs_summary_tags *st,
+ int blk);
+void yaffs_summary_gc(struct yaffs_dev *dev, int blk);
+
int lazy_loading_overridden;
int empty_lost_and_found;
int empty_lost_and_found_overridden;
int lazy_loading_overridden;
int empty_lost_and_found;
int empty_lost_and_found_overridden;
};
#define MAX_OPT_LEN 30
};
#define MAX_OPT_LEN 30
} else if (!strcmp(cur_opt, "lazy-loading-on")) {
options->lazy_loading_enabled = 1;
options->lazy_loading_overridden = 1;
} else if (!strcmp(cur_opt, "lazy-loading-on")) {
options->lazy_loading_enabled = 1;
options->lazy_loading_overridden = 1;
+ } else if (!strcmp(cur_opt, "disable_summary")) {
+ options->disable_summary = 1;
} else if (!strcmp(cur_opt, "empty-lost-and-found-off")) {
options->empty_lost_and_found = 0;
options->empty_lost_and_found_overridden = 1;
} else if (!strcmp(cur_opt, "empty-lost-and-found-off")) {
options->empty_lost_and_found = 0;
options->empty_lost_and_found_overridden = 1;
#ifdef CONFIG_YAFFS__ALWAYS_CHECK_CHUNK_ERASED
param->always_check_erased = 1;
#endif
#ifdef CONFIG_YAFFS__ALWAYS_CHECK_CHUNK_ERASED
param->always_check_erased = 1;
#endif
+ param->disable_summary = options.disable_summary;
if (options.empty_lost_and_found_overridden)
param->empty_lost_n_found = options.empty_lost_and_found;
if (options.empty_lost_and_found_overridden)
param->empty_lost_n_found = options.empty_lost_and_found;
dev->n_unlinked_files);
buf += sprintf(buf, "refresh_count........ %u\n", dev->refresh_count);
buf += sprintf(buf, "n_bg_deletions....... %u\n", dev->n_bg_deletions);
dev->n_unlinked_files);
buf += sprintf(buf, "refresh_count........ %u\n", dev->refresh_count);
buf += sprintf(buf, "n_bg_deletions....... %u\n", dev->n_bg_deletions);
+ buf += sprintf(buf, "tags_used............ %u\n", dev->tags_used);
+ buf += sprintf(buf, "summary_used......... %u\n", dev->summary_used);
result = yaffs_summary_fetch(dev, &tags, chunk_in_block);
tags.seq_number = bi->seq_number;
}
result = yaffs_summary_fetch(dev, &tags, chunk_in_block);
tags.seq_number = bi->seq_number;
}
-
- if (!summary_available || tags.obj_id == 0)
+
+ if (!summary_available || tags.obj_id == 0) {
result = yaffs_rd_chunk_tags_nand(dev, chunk, NULL, &tags);
result = yaffs_rd_chunk_tags_nand(dev, chunk, NULL, &tags);
+ dev->tags_used++;
+ } else {
+ dev->summary_used++;
+ }
/* Let's have a good look at this chunk... */
/* Let's have a good look at this chunk... */
bi = yaffs_get_block_info(dev, blk);
deleted = 0;
bi = yaffs_get_block_info(dev, blk);
deleted = 0;
- summary_available = yaffs_summary_read(dev, blk);
+ summary_available = yaffs_summary_read(dev, dev->sum_tags, blk);
/* For each chunk in each block that needs scanning.... */
found_chunks = 0;
/* For each chunk in each block that needs scanning.... */
found_chunks = 0;