#include <string.h>
#include <stdlib.h>
+static void ext4_bdif_lock(struct ext4_blockdev *bdev)
+{
+ if (!bdev->bdif->lock)
+ return;
+
+ int r = bdev->bdif->lock(bdev);
+ ext4_assert(r == EOK);
+}
+
+static void ext4_bdif_unlock(struct ext4_blockdev *bdev)
+{
+ if (!bdev->bdif->unlock)
+ return;
+
+ int r = bdev->bdif->unlock(bdev);
+ ext4_assert(r == EOK);
+}
+
+static int ext4_bdif_bread(struct ext4_blockdev *bdev, void *buf,
+ uint64_t blk_id, uint32_t blk_cnt)
+{
+ ext4_bdif_lock(bdev);
+ int r = bdev->bdif->bread(bdev, buf, blk_id, blk_cnt);
+ bdev->bdif->bread_ctr++;
+ ext4_bdif_unlock(bdev);
+ return r;
+}
+
+static int ext4_bdif_bwrite(struct ext4_blockdev *bdev, const void *buf,
+ uint64_t blk_id, uint32_t blk_cnt)
+{
+ ext4_bdif_lock(bdev);
+ int r = bdev->bdif->bwrite(bdev, buf, blk_id, blk_cnt);
+ bdev->bdif->bwrite_ctr++;
+ ext4_bdif_unlock(bdev);
+ return r;
+}
+
int ext4_block_init(struct ext4_blockdev *bdev)
{
int rc;
ext4_assert(bdev);
-
- ext4_assert(bdev->open && bdev->close && bdev->bread && bdev->bwrite);
+ ext4_assert(bdev->bdif);
+ ext4_assert(bdev->bdif->open &&
+ bdev->bdif->close &&
+ bdev->bdif->bread &&
+ bdev->bdif->bwrite);
+
+ if (bdev->bdif->ph_refctr) {
+ bdev->bdif->ph_refctr++;
+ return EOK;
+ }
/*Low level block init*/
- rc = bdev->open(bdev);
+ rc = bdev->bdif->open(bdev);
if (rc != EOK)
return rc;
- bdev->flags |= EXT4_BDEV_INITIALIZED;
-
+ bdev->bdif->ph_refctr = 1;
return EOK;
}
{
ext4_assert(bdev && bc);
bdev->bc = bc;
+ bc->bdev = bdev;
return EOK;
}
void ext4_block_set_lb_size(struct ext4_blockdev *bdev, uint64_t lb_bsize)
{
/*Logical block size has to be multiply of physical */
- ext4_assert(!(lb_bsize % bdev->ph_bsize));
+ ext4_assert(!(lb_bsize % bdev->bdif->ph_bsize));
bdev->lg_bsize = lb_bsize;
- bdev->lg_bcnt = (bdev->ph_bcnt * bdev->ph_bsize) / lb_bsize;
+ bdev->lg_bcnt = bdev->part_size / lb_bsize;
}
int ext4_block_fini(struct ext4_blockdev *bdev)
{
ext4_assert(bdev);
- bdev->flags &= ~(EXT4_BDEV_INITIALIZED);
+ if (!bdev->bdif->ph_refctr)
+ return EOK;
+
+ bdev->bdif->ph_refctr--;
+ if (bdev->bdif->ph_refctr)
+ return EOK;
/*Low level block fini*/
- return bdev->close(bdev);
+ return bdev->bdif->close(bdev);
}
-static int
-ext4_block_flush_buf(struct ext4_blockdev *bdev, struct ext4_buf *buf)
+int ext4_block_flush_buf(struct ext4_blockdev *bdev, struct ext4_buf *buf)
{
int r;
struct ext4_bcache *bc = bdev->bc;
- /*Only flushing unreferenced buffer is allowed.*/
- ext4_assert(!buf->refctr);
- if (ext4_bcache_test_flag(buf, BC_DIRTY)) {
+ if (ext4_bcache_test_flag(buf, BC_DIRTY) &&
+ ext4_bcache_test_flag(buf, BC_UPTODATE)) {
r = ext4_blocks_set_direct(bdev, buf->data, buf->lba, 1);
- if (r)
+ if (r) {
+ if (buf->end_write) {
+ bc->dont_shake = true;
+ buf->end_write(bc, buf, r, buf->end_write_arg);
+ bc->dont_shake = false;
+ }
+
return r;
+ }
- SLIST_REMOVE(&bc->dirty_list,
- buf,
- ext4_buf,
- dirty_node);
+ ext4_bcache_remove_dirty_node(bc, buf);
ext4_bcache_clear_flag(buf, BC_DIRTY);
+ if (buf->end_write) {
+ bc->dont_shake = true;
+ buf->end_write(bc, buf, r, buf->end_write_arg);
+ bc->dont_shake = false;
+ }
}
return EOK;
}
+int ext4_block_flush_lba(struct ext4_blockdev *bdev, uint64_t lba)
+{
+ int r = EOK;
+ struct ext4_buf *buf;
+ struct ext4_block b;
+ buf = ext4_bcache_find_get(bdev->bc, &b, lba);
+ if (buf) {
+ r = ext4_block_flush_buf(bdev, buf);
+ ext4_bcache_free(bdev->bc, &b);
+ }
+ return r;
+}
+
int ext4_block_cache_shake(struct ext4_blockdev *bdev)
{
+ int r = EOK;
struct ext4_buf *buf;
+ if (bdev->bc->dont_shake)
+ return EOK;
+
while (!RB_EMPTY(&bdev->bc->lru_root) &&
ext4_bcache_is_full(bdev->bc)) {
-
+
buf = ext4_buf_lowest_lru(bdev->bc);
ext4_assert(buf);
if (ext4_bcache_test_flag(buf, BC_DIRTY)) {
- int r = ext4_block_flush_buf(bdev, buf);
+ r = ext4_block_flush_buf(bdev, buf);
if (r != EOK)
- return r;
+ break;
}
ext4_bcache_drop_buf(bdev->bc, buf);
}
- return EOK;
+ return r;
}
int ext4_block_get_noread(struct ext4_blockdev *bdev, struct ext4_block *b,
ext4_assert(bdev && b);
- if (!(bdev->flags & EXT4_BDEV_INITIALIZED))
+ if (!bdev->bdif->ph_refctr)
return EIO;
if (!(lba < bdev->lg_bcnt))
return ERANGE;
- b->dirty = 0;
b->lb_id = lba;
/*If cache is full we have to (flush and) drop it anyway :(*/
int ext4_block_get(struct ext4_blockdev *bdev, struct ext4_block *b,
uint64_t lba)
{
- uint64_t pba;
- uint32_t pb_cnt;
int r = ext4_block_get_noread(bdev, b, lba);
if (r != EOK)
return r;
- if (b->uptodate) {
+ if (ext4_bcache_test_flag(b->buf, BC_UPTODATE)) {
/* Data in the cache is up-to-date.
* Reading from physical device is not required */
return EOK;
}
- pba = (lba * bdev->lg_bsize) / bdev->ph_bsize;
- pb_cnt = bdev->lg_bsize / bdev->ph_bsize;
-
- r = bdev->bread(bdev, b->data, pba, pb_cnt);
-
+ r = ext4_blocks_get_direct(bdev, b->data, lba, 1);
if (r != EOK) {
ext4_bcache_free(bdev->bc, b);
b->lb_id = 0;
/* Mark buffer up-to-date, since
* fresh data is read from physical device just now. */
ext4_bcache_set_flag(b->buf, BC_UPTODATE);
- b->uptodate = true;
- bdev->bread_ctr++;
return EOK;
}
int ext4_block_set(struct ext4_blockdev *bdev, struct ext4_block *b)
{
- uint64_t pba;
- uint32_t pb_cnt;
- int r;
-
ext4_assert(bdev && b);
ext4_assert(b->buf);
- if (!(bdev->flags & EXT4_BDEV_INITIALIZED))
+ if (!bdev->bdif->ph_refctr)
return EIO;
- /*Free cache delay mode*/
- if (bdev->cache_write_back) {
-
- /*Free cache block and mark as free delayed*/
- return ext4_bcache_free(bdev->bc, b);
- }
-
- if (b->buf->refctr > 1)
- return ext4_bcache_free(bdev->bc, b);
-
- /*We handle the dirty flag ourselves.*/
- if (ext4_bcache_test_flag(b->buf, BC_DIRTY) || b->dirty) {
- b->uptodate = true;
- ext4_bcache_set_flag(b->buf, BC_UPTODATE);
-
- pba = (b->lb_id * bdev->lg_bsize) / bdev->ph_bsize;
- pb_cnt = bdev->lg_bsize / bdev->ph_bsize;
-
- r = bdev->bwrite(bdev, b->data, pba, pb_cnt);
- ext4_bcache_clear_flag(b->buf, BC_DIRTY);
- if (r != EOK) {
- b->dirty = true;
- ext4_bcache_free(bdev->bc, b);
- return r;
- }
-
- b->dirty = false;
- bdev->bwrite_ctr++;
- }
- ext4_bcache_free(bdev->bc, b);
- return EOK;
+ return ext4_bcache_free(bdev->bc, b);
}
int ext4_blocks_get_direct(struct ext4_blockdev *bdev, void *buf, uint64_t lba,
ext4_assert(bdev && buf);
- pba = (lba * bdev->lg_bsize) / bdev->ph_bsize;
- pb_cnt = bdev->lg_bsize / bdev->ph_bsize;
+ pba = (lba * bdev->lg_bsize + bdev->part_offset) / bdev->bdif->ph_bsize;
+ pb_cnt = bdev->lg_bsize / bdev->bdif->ph_bsize;
- bdev->bread_ctr++;
- return bdev->bread(bdev, buf, pba, pb_cnt * cnt);
+ return ext4_bdif_bread(bdev, buf, pba, pb_cnt * cnt);
}
int ext4_blocks_set_direct(struct ext4_blockdev *bdev, const void *buf,
ext4_assert(bdev && buf);
- pba = (lba * bdev->lg_bsize) / bdev->ph_bsize;
- pb_cnt = bdev->lg_bsize / bdev->ph_bsize;
-
- bdev->bwrite_ctr++;
+ pba = (lba * bdev->lg_bsize + bdev->part_offset) / bdev->bdif->ph_bsize;
+ pb_cnt = bdev->lg_bsize / bdev->bdif->ph_bsize;
- return bdev->bwrite(bdev, buf, pba, pb_cnt * cnt);
+ return ext4_bdif_bwrite(bdev, buf, pba, pb_cnt * cnt);
}
int ext4_block_writebytes(struct ext4_blockdev *bdev, uint64_t off,
const void *buf, uint32_t len)
{
uint64_t block_idx;
- uint64_t block_end;
uint32_t blen;
uint32_t unalg;
int r = EOK;
ext4_assert(bdev && buf);
- if (!(bdev->flags & EXT4_BDEV_INITIALIZED))
+ if (!bdev->bdif->ph_refctr)
return EIO;
- block_idx = off / bdev->ph_bsize;
- block_end = block_idx + len / bdev->ph_bsize;
-
- if (!(block_end < bdev->ph_bcnt))
+ if (off + len > bdev->part_size)
return EINVAL; /*Ups. Out of range operation*/
+ block_idx = ((off + bdev->part_offset) / bdev->bdif->ph_bsize);
+
/*OK lets deal with the first possible unaligned block*/
- unalg = (off & (bdev->ph_bsize - 1));
+ unalg = (off & (bdev->bdif->ph_bsize - 1));
if (unalg) {
- uint32_t wlen = (bdev->ph_bsize - unalg) > len
+ uint32_t wlen = (bdev->bdif->ph_bsize - unalg) > len
? len
- : (bdev->ph_bsize - unalg);
+ : (bdev->bdif->ph_bsize - unalg);
- r = bdev->bread(bdev, bdev->ph_bbuf, block_idx, 1);
+ r = ext4_bdif_bread(bdev, bdev->bdif->ph_bbuf, block_idx, 1);
if (r != EOK)
return r;
- memcpy(bdev->ph_bbuf + unalg, p, wlen);
-
- r = bdev->bwrite(bdev, bdev->ph_bbuf, block_idx, 1);
+ memcpy(bdev->bdif->ph_bbuf + unalg, p, wlen);
+ r = ext4_bdif_bwrite(bdev, bdev->bdif->ph_bbuf, block_idx, 1);
if (r != EOK)
return r;
}
/*Aligned data*/
- blen = len / bdev->ph_bsize;
- r = bdev->bwrite(bdev, p, block_idx, blen);
+ blen = len / bdev->bdif->ph_bsize;
+ r = ext4_bdif_bwrite(bdev, p, block_idx, blen);
if (r != EOK)
return r;
- p += bdev->ph_bsize * blen;
- len -= bdev->ph_bsize * blen;
+ p += bdev->bdif->ph_bsize * blen;
+ len -= bdev->bdif->ph_bsize * blen;
block_idx += blen;
/*Rest of the data*/
if (len) {
- r = bdev->bread(bdev, bdev->ph_bbuf, block_idx, 1);
+ r = ext4_bdif_bread(bdev, bdev->bdif->ph_bbuf, block_idx, 1);
if (r != EOK)
return r;
- memcpy(bdev->ph_bbuf, p, len);
-
- r = bdev->bwrite(bdev, bdev->ph_bbuf, block_idx, 1);
+ memcpy(bdev->bdif->ph_bbuf, p, len);
+ r = ext4_bdif_bwrite(bdev, bdev->bdif->ph_bbuf, block_idx, 1);
if (r != EOK)
return r;
}
uint32_t len)
{
uint64_t block_idx;
- uint64_t block_end;
uint32_t blen;
uint32_t unalg;
int r = EOK;
ext4_assert(bdev && buf);
- if (!(bdev->flags & EXT4_BDEV_INITIALIZED))
+ if (!bdev->bdif->ph_refctr)
return EIO;
- block_idx = off / bdev->ph_bsize;
- block_end = block_idx + len / bdev->ph_bsize;
-
- if (!(block_end < bdev->ph_bcnt))
+ if (off + len > bdev->part_size)
return EINVAL; /*Ups. Out of range operation*/
+ block_idx = ((off + bdev->part_offset) / bdev->bdif->ph_bsize);
+
/*OK lets deal with the first possible unaligned block*/
- unalg = (off & (bdev->ph_bsize - 1));
+ unalg = (off & (bdev->bdif->ph_bsize - 1));
if (unalg) {
- uint32_t rlen = (bdev->ph_bsize - unalg) > len
+ uint32_t rlen = (bdev->bdif->ph_bsize - unalg) > len
? len
- : (bdev->ph_bsize - unalg);
+ : (bdev->bdif->ph_bsize - unalg);
- r = bdev->bread(bdev, bdev->ph_bbuf, block_idx, 1);
+ r = ext4_bdif_bread(bdev, bdev->bdif->ph_bbuf, block_idx, 1);
if (r != EOK)
return r;
- memcpy(p, bdev->ph_bbuf + unalg, rlen);
+ memcpy(p, bdev->bdif->ph_bbuf + unalg, rlen);
p += rlen;
len -= rlen;
}
/*Aligned data*/
- blen = len / bdev->ph_bsize;
+ blen = len / bdev->bdif->ph_bsize;
- r = bdev->bread(bdev, p, block_idx, blen);
+ r = ext4_bdif_bread(bdev, p, block_idx, blen);
if (r != EOK)
return r;
- p += bdev->ph_bsize * blen;
- len -= bdev->ph_bsize * blen;
+ p += bdev->bdif->ph_bsize * blen;
+ len -= bdev->bdif->ph_bsize * blen;
block_idx += blen;
/*Rest of the data*/
if (len) {
- r = bdev->bread(bdev, bdev->ph_bbuf, block_idx, 1);
+ r = ext4_bdif_bread(bdev, bdev->bdif->ph_bbuf, block_idx, 1);
if (r != EOK)
return r;
- memcpy(p, bdev->ph_bbuf, len);
+ memcpy(p, bdev->bdif->ph_bbuf, len);
}
return r;
}
-int ext4_block_cache_write_back(struct ext4_blockdev *bdev, uint8_t on_off)
+int ext4_block_cache_flush(struct ext4_blockdev *bdev)
{
- int r;
- struct ext4_buf *buf;
+ while (!SLIST_EMPTY(&bdev->bc->dirty_list)) {
+ int r;
+ struct ext4_buf *buf = SLIST_FIRST(&bdev->bc->dirty_list);
+ ext4_assert(buf);
+ r = ext4_block_flush_buf(bdev, buf);
+ if (r != EOK)
+ return r;
+
+ }
+ return EOK;
+}
+int ext4_block_cache_write_back(struct ext4_blockdev *bdev, uint8_t on_off)
+{
if (on_off)
bdev->cache_write_back++;
if (bdev->cache_write_back)
return EOK;
- /*Flush all delayed cache blocks*/
- while (!SLIST_EMPTY(&bdev->bc->dirty_list)) {
-
- buf = SLIST_FIRST(&bdev->bc->dirty_list);
- ext4_assert(buf);
- r = ext4_block_flush_buf(bdev, buf);
- if (r != EOK)
- return r;
-
- }
- return EOK;
+ /*Flush data in all delayed cache blocks*/
+ return ext4_block_cache_flush(bdev);
}
/**
projects / lwext4.git / blobdiff