Changes in uspace/lib/libblock/libblock.c [7a56b1ed:08232ee] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/libblock/libblock.c
r7a56b1ed r08232ee 47 47 #include <as.h> 48 48 #include <assert.h> 49 #include <fibril_sync .h>49 #include <fibril_synch.h> 50 50 #include <adt/list.h> 51 51 #include <adt/hash_table.h> 52 #include <macros.h> 52 53 #include <mem.h> 53 54 … … 62 63 typedef struct { 63 64 fibril_mutex_t lock; 64 size_t block_size; /**< Block size. */65 size_t lblock_size; /**< Logical block size. */ 65 66 unsigned block_count; /**< Total number of blocks. */ 66 67 unsigned blocks_cached; /**< Number of cached blocks. */ … … 74 75 dev_handle_t dev_handle; 75 76 int dev_phone; 76 fibril_mutex_t com _area_lock;77 void *com _area;78 size_t com _size;77 fibril_mutex_t comm_area_lock; 78 void *comm_area; 79 size_t comm_size; 79 80 void *bb_buf; 80 off_t bb_off;81 size_t bb_size;81 bn_t bb_addr; 82 size_t pblock_size; /**< Physical block size. */ 82 83 cache_t *cache; 83 84 } devcon_t; 84 85 85 static int read_block(devcon_t *devcon, bn_t boff, size_t block_size); 86 static int write_block(devcon_t *devcon, bn_t boff, size_t block_size); 86 static int read_blocks(devcon_t *devcon, bn_t ba, size_t cnt); 87 static int write_blocks(devcon_t *devcon, bn_t ba, size_t cnt); 88 static int get_block_size(int dev_phone, size_t *bsize); 89 static int get_num_blocks(int dev_phone, bn_t *nblocks); 87 90 88 91 static devcon_t *devcon_search(dev_handle_t dev_handle) … … 102 105 } 103 106 104 static int devcon_add(dev_handle_t dev_handle, int dev_phone, void *com_area,105 size_t com_size)107 static int devcon_add(dev_handle_t dev_handle, int dev_phone, size_t bsize, 108 void *comm_area, size_t comm_size) 106 109 { 107 110 link_t *cur; 108 111 devcon_t *devcon; 112 113 if (comm_size < bsize) 114 return EINVAL; 109 115 110 116 devcon = malloc(sizeof(devcon_t)); … … 115 121 devcon->dev_handle = dev_handle; 116 122 devcon->dev_phone = dev_phone; 117 fibril_mutex_initialize(&devcon->com _area_lock);118 devcon->com _area = com_area;119 devcon->com _size = com_size;123 fibril_mutex_initialize(&devcon->comm_area_lock); 124 devcon->comm_area = comm_area; 125 devcon->comm_size = comm_size; 120 126 devcon->bb_buf = NULL; 121 devcon->bb_ off= 0;122 devcon-> bb_size = 0;127 devcon->bb_addr = 0; 128 devcon->pblock_size = bsize; 123 129 devcon->cache = NULL; 124 130 … … 144 150 } 145 151 146 int block_init(dev_handle_t dev_handle, size_t com _size)152 int block_init(dev_handle_t dev_handle, size_t comm_size) 147 153 { 148 154 int rc; 149 155 int dev_phone; 150 void *com_area; 151 152 com_area = mmap(NULL, com_size, PROTO_READ | PROTO_WRITE, 156 void *comm_area; 157 size_t bsize; 158 159 comm_area = mmap(NULL, comm_size, PROTO_READ | PROTO_WRITE, 153 160 MAP_ANONYMOUS | MAP_PRIVATE, 0, 0); 154 if (!com _area) {161 if (!comm_area) { 155 162 return ENOMEM; 156 163 } … … 158 165 dev_phone = devmap_device_connect(dev_handle, IPC_FLAG_BLOCKING); 159 166 if (dev_phone < 0) { 160 munmap(com _area, com_size);167 munmap(comm_area, comm_size); 161 168 return dev_phone; 162 169 } 163 170 164 rc = ipc_share_out_start(dev_phone, com_area,171 rc = async_share_out_start(dev_phone, comm_area, 165 172 AS_AREA_READ | AS_AREA_WRITE); 166 173 if (rc != EOK) { 167 munmap(com _area, com_size);174 munmap(comm_area, comm_size); 168 175 ipc_hangup(dev_phone); 169 176 return rc; 170 177 } 171 172 rc = devcon_add(dev_handle, dev_phone, com_area, com_size); 178 179 if (get_block_size(dev_phone, &bsize) != EOK) { 180 munmap(comm_area, comm_size); 181 ipc_hangup(dev_phone); 182 return rc; 183 } 184 185 rc = devcon_add(dev_handle, dev_phone, bsize, comm_area, comm_size); 173 186 if (rc != EOK) { 174 munmap(com _area, com_size);187 munmap(comm_area, comm_size); 175 188 ipc_hangup(dev_phone); 176 189 return rc; … … 195 208 } 196 209 197 munmap(devcon->com _area, devcon->com_size);210 munmap(devcon->comm_area, devcon->comm_size); 198 211 ipc_hangup(devcon->dev_phone); 199 212 … … 201 214 } 202 215 203 int block_bb_read(dev_handle_t dev_handle, off_t off, size_t size)216 int block_bb_read(dev_handle_t dev_handle, bn_t ba) 204 217 { 205 218 void *bb_buf; … … 211 224 if (devcon->bb_buf) 212 225 return EEXIST; 213 bb_buf = malloc( size);226 bb_buf = malloc(devcon->pblock_size); 214 227 if (!bb_buf) 215 228 return ENOMEM; 216 217 fibril_mutex_lock(&devcon->com _area_lock);218 rc = read_block (devcon, 0, size);229 230 fibril_mutex_lock(&devcon->comm_area_lock); 231 rc = read_blocks(devcon, 0, 1); 219 232 if (rc != EOK) { 220 fibril_mutex_unlock(&devcon->com _area_lock);233 fibril_mutex_unlock(&devcon->comm_area_lock); 221 234 free(bb_buf); 222 235 return rc; 223 236 } 224 memcpy(bb_buf, devcon->com _area,size);225 fibril_mutex_unlock(&devcon->com _area_lock);237 memcpy(bb_buf, devcon->comm_area, devcon->pblock_size); 238 fibril_mutex_unlock(&devcon->comm_area_lock); 226 239 227 240 devcon->bb_buf = bb_buf; 228 devcon->bb_off = off; 229 devcon->bb_size = size; 241 devcon->bb_addr = ba; 230 242 231 243 return EOK; … … 275 287 fibril_mutex_initialize(&cache->lock); 276 288 list_initialize(&cache->free_head); 277 cache-> block_size = size;289 cache->lblock_size = size; 278 290 cache->block_count = blocks; 279 291 cache->blocks_cached = 0; 280 292 cache->mode = mode; 293 294 /* No block size translation a.t.m. */ 295 assert(cache->lblock_size == devcon->pblock_size); 281 296 282 297 if (!hash_table_create(&cache->block_hash, CACHE_BUCKETS, 1, … … 371 386 if (!b) 372 387 goto recycle; 373 b->data = malloc(cache-> block_size);388 b->data = malloc(cache->lblock_size); 374 389 if (!b->data) { 375 390 free(b); … … 405 420 list_append(&b->free_link, &cache->free_head); 406 421 fibril_mutex_unlock(&cache->lock); 407 fibril_mutex_lock(&devcon->com_area_lock); 408 memcpy(devcon->com_area, b->data, b->size); 409 rc = write_block(devcon, b->boff, 410 cache->block_size); 411 fibril_mutex_unlock(&devcon->com_area_lock); 422 fibril_mutex_lock(&devcon->comm_area_lock); 423 memcpy(devcon->comm_area, b->data, b->size); 424 rc = write_blocks(devcon, b->boff, 1); 425 fibril_mutex_unlock(&devcon->comm_area_lock); 412 426 if (rc != EOK) { 413 427 /* … … 444 458 block_initialize(b); 445 459 b->dev_handle = dev_handle; 446 b->size = cache-> block_size;460 b->size = cache->lblock_size; 447 461 b->boff = boff; 448 462 hash_table_insert(&cache->block_hash, &key, &b->hash_link); … … 461 475 * the new contents from the device. 462 476 */ 463 fibril_mutex_lock(&devcon->com _area_lock);464 rc = read_block (devcon, b->boff, cache->block_size);465 memcpy(b->data, devcon->com _area, cache->block_size);466 fibril_mutex_unlock(&devcon->com _area_lock);477 fibril_mutex_lock(&devcon->comm_area_lock); 478 rc = read_blocks(devcon, b->boff, 1); 479 memcpy(b->data, devcon->comm_area, cache->lblock_size); 480 fibril_mutex_unlock(&devcon->comm_area_lock); 467 481 if (rc != EOK) 468 482 b->toxic = true; … … 521 535 if (block->dirty && (block->refcnt == 1) && 522 536 (blocks_cached > CACHE_HI_WATERMARK || mode != CACHE_MODE_WB)) { 523 fibril_mutex_lock(&devcon->com _area_lock);524 memcpy(devcon->com _area, block->data, block->size);525 rc = write_block (devcon, block->boff, block->size);526 fibril_mutex_unlock(&devcon->com _area_lock);537 fibril_mutex_lock(&devcon->comm_area_lock); 538 memcpy(devcon->comm_area, block->data, block->size); 539 rc = write_blocks(devcon, block->boff, 1); 540 fibril_mutex_unlock(&devcon->comm_area_lock); 527 541 block->dirty = false; 528 542 } … … 601 615 */ 602 616 int block_seqread(dev_handle_t dev_handle, off_t *bufpos, size_t *buflen, 603 off_t *pos, void *dst, size_t size , size_t block_size)617 off_t *pos, void *dst, size_t size) 604 618 { 605 619 off_t offset = 0; 606 620 size_t left = size; 607 devcon_t *devcon = devcon_search(dev_handle); 608 assert(devcon); 609 610 fibril_mutex_lock(&devcon->com_area_lock); 621 size_t block_size; 622 devcon_t *devcon; 623 624 devcon = devcon_search(dev_handle); 625 assert(devcon); 626 block_size = devcon->pblock_size; 627 628 fibril_mutex_lock(&devcon->comm_area_lock); 611 629 while (left > 0) { 612 630 size_t rd; … … 622 640 * destination buffer. 623 641 */ 624 memcpy(dst + offset, devcon->com _area + *bufpos, rd);642 memcpy(dst + offset, devcon->comm_area + *bufpos, rd); 625 643 offset += rd; 626 644 *bufpos += rd; … … 633 651 int rc; 634 652 635 rc = read_block (devcon, *pos / block_size, block_size);653 rc = read_blocks(devcon, *pos / block_size, 1); 636 654 if (rc != EOK) { 637 fibril_mutex_unlock(&devcon->com _area_lock);655 fibril_mutex_unlock(&devcon->comm_area_lock); 638 656 return rc; 639 657 } … … 643 661 } 644 662 } 645 fibril_mutex_unlock(&devcon->com _area_lock);663 fibril_mutex_unlock(&devcon->comm_area_lock); 646 664 647 665 return EOK; 648 666 } 649 667 650 /** Read block from block device. 668 /** Read blocks directly from device (bypass cache). 669 * 670 * @param dev_handle Device handle of the block device. 671 * @param ba Address of first block. 672 * @param cnt Number of blocks. 673 * @param src Buffer for storing the data. 674 * 675 * @return EOK on success or negative error code on failure. 676 */ 677 int block_read_direct(dev_handle_t dev_handle, bn_t ba, size_t cnt, void *buf) 678 { 679 devcon_t *devcon; 680 int rc; 681 682 devcon = devcon_search(dev_handle); 683 assert(devcon); 684 685 fibril_mutex_lock(&devcon->comm_area_lock); 686 687 rc = read_blocks(devcon, ba, cnt); 688 if (rc == EOK) 689 memcpy(buf, devcon->comm_area, devcon->pblock_size * cnt); 690 691 fibril_mutex_unlock(&devcon->comm_area_lock); 692 693 return rc; 694 } 695 696 /** Write blocks directly to device (bypass cache). 697 * 698 * @param dev_handle Device handle of the block device. 699 * @param ba Address of first block. 700 * @param cnt Number of blocks. 701 * @param src The data to be written. 702 * 703 * @return EOK on success or negative error code on failure. 704 */ 705 int block_write_direct(dev_handle_t dev_handle, bn_t ba, size_t cnt, 706 const void *data) 707 { 708 devcon_t *devcon; 709 int rc; 710 711 devcon = devcon_search(dev_handle); 712 assert(devcon); 713 714 fibril_mutex_lock(&devcon->comm_area_lock); 715 716 memcpy(devcon->comm_area, data, devcon->pblock_size * cnt); 717 rc = write_blocks(devcon, ba, cnt); 718 719 fibril_mutex_unlock(&devcon->comm_area_lock); 720 721 return rc; 722 } 723 724 /** Get device block size. 725 * 726 * @param dev_handle Device handle of the block device. 727 * @param bsize Output block size. 728 * 729 * @return EOK on success or negative error code on failure. 730 */ 731 int block_get_bsize(dev_handle_t dev_handle, size_t *bsize) 732 { 733 devcon_t *devcon; 734 735 devcon = devcon_search(dev_handle); 736 assert(devcon); 737 738 return get_block_size(devcon->dev_phone, bsize); 739 } 740 741 /** Get number of blocks on device. 742 * 743 * @param dev_handle Device handle of the block device. 744 * @param nblocks Output number of blocks. 745 * 746 * @return EOK on success or negative error code on failure. 747 */ 748 int block_get_nblocks(dev_handle_t dev_handle, bn_t *nblocks) 749 { 750 devcon_t *devcon; 751 752 devcon = devcon_search(dev_handle); 753 assert(devcon); 754 755 return get_num_blocks(devcon->dev_phone, nblocks); 756 } 757 758 /** Read blocks from block device. 651 759 * 652 760 * @param devcon Device connection. 653 * @param b off Block index.654 * @param block_size Block size.761 * @param ba Address of first block. 762 * @param cnt Number of blocks. 655 763 * @param src Buffer for storing the data. 656 764 * 657 765 * @return EOK on success or negative error code on failure. 658 766 */ 659 static int read_block(devcon_t *devcon, bn_t boff, size_t block_size) 660 { 661 ipcarg_t retval; 767 static int read_blocks(devcon_t *devcon, bn_t ba, size_t cnt) 768 { 662 769 int rc; 663 770 664 771 assert(devcon); 665 rc = async_req_2_1(devcon->dev_phone, BD_READ_BLOCK, boff, block_size, 666 &retval); 667 if ((rc != EOK) || (retval != EOK)) 668 return (rc != EOK ? rc : (int) retval); 669 670 return EOK; 772 rc = async_req_3_0(devcon->dev_phone, BD_READ_BLOCKS, LOWER32(ba), 773 UPPER32(ba), cnt); 774 return rc; 671 775 } 672 776 … … 674 778 * 675 779 * @param devcon Device connection. 676 * @param b off Block index.677 * @param block_size Block size.780 * @param ba Address of first block. 781 * @param cnt Number of blocks. 678 782 * @param src Buffer containing the data to write. 679 783 * 680 784 * @return EOK on success or negative error code on failure. 681 785 */ 682 static int write_block(devcon_t *devcon, bn_t boff, size_t block_size) 683 { 684 ipcarg_t retval; 786 static int write_blocks(devcon_t *devcon, bn_t ba, size_t cnt) 787 { 685 788 int rc; 686 789 687 790 assert(devcon); 688 rc = async_req_2_1(devcon->dev_phone, BD_WRITE_BLOCK, boff, block_size, 689 &retval); 690 if ((rc != EOK) || (retval != EOK)) 691 return (rc != EOK ? rc : (int) retval); 692 693 return EOK; 791 rc = async_req_3_0(devcon->dev_phone, BD_WRITE_BLOCKS, LOWER32(ba), 792 UPPER32(ba), cnt); 793 return rc; 794 } 795 796 /** Get block size used by the device. */ 797 static int get_block_size(int dev_phone, size_t *bsize) 798 { 799 ipcarg_t bs; 800 int rc; 801 802 rc = async_req_0_1(dev_phone, BD_GET_BLOCK_SIZE, &bs); 803 if (rc == EOK) 804 *bsize = (size_t) bs; 805 806 return rc; 807 } 808 809 /** Get total number of blocks on block device. */ 810 static int get_num_blocks(int dev_phone, bn_t *nblocks) 811 { 812 ipcarg_t nb_l, nb_h; 813 int rc; 814 815 rc = async_req_0_2(dev_phone, BD_GET_NUM_BLOCKS, &nb_l, &nb_h); 816 if (rc == EOK) { 817 *nblocks = (bn_t) MERGE_LOUP32(nb_l, nb_h); 818 } 819 820 return rc; 694 821 } 695 822
Note:
See TracChangeset
for help on using the changeset viewer.