--- zzzz-none-000/linux-3.10.107/drivers/mtd/devices/block2mtd.c 2017-06-27 09:49:32.000000000 +0000 +++ vr9-7490-729/linux-3.10.107/drivers/mtd/devices/block2mtd.c 2021-11-10 11:53:55.000000000 +0000 @@ -17,6 +17,7 @@ #include #include #include +#include #define ERROR(fmt, args...) printk(KERN_ERR "block2mtd: " fmt "\n" , ## args) #define INFO(fmt, args...) printk(KERN_INFO "block2mtd: " fmt "\n" , ## args) @@ -28,6 +29,8 @@ struct block_device *blkdev; struct mtd_info mtd; struct mutex write_mutex; + rwlock_t bdev_mutex; + char devname[0]; }; @@ -79,6 +82,12 @@ size_t len = instr->len; int err; + read_lock(&dev->bdev_mutex); + if (!dev->blkdev) { + err = -EINVAL; + goto done; + } + instr->state = MTD_ERASING; mutex_lock(&dev->write_mutex); err = _block2mtd_erase(dev, from, len); @@ -90,6 +99,10 @@ instr->state = MTD_ERASE_DONE; mtd_erase_callback(instr); + +done: + read_unlock(&dev->bdev_mutex); + return err; } @@ -102,6 +115,13 @@ int index = from >> PAGE_SHIFT; int offset = from & (PAGE_SIZE-1); int cpylen; + int err = 0; + + read_lock(&dev->bdev_mutex); + if (!dev->blkdev || (from > mtd->size)) { + err = -EINVAL; + goto done; + } while (len) { if ((offset + len) > PAGE_SIZE) @@ -123,7 +143,10 @@ offset = 0; index++; } - return 0; + +done: + read_unlock(&dev->bdev_mutex); + return err; } @@ -172,13 +195,22 @@ size_t *retlen, const u_char *buf) { struct block2mtd_dev *dev = mtd->priv; - int err; + int err = 0; + + read_lock(&dev->bdev_mutex); + if (!dev->blkdev) { + err = -EINVAL; + goto done; + } mutex_lock(&dev->write_mutex); err = _block2mtd_write(dev, buf, to, len, retlen); mutex_unlock(&dev->write_mutex); if (err > 0) err = 0; + +done: + read_unlock(&dev->bdev_mutex); return err; } @@ -187,10 +219,13 @@ static void block2mtd_sync(struct mtd_info *mtd) { struct block2mtd_dev *dev = mtd->priv; + read_lock(&dev->bdev_mutex); sync_blockdev(dev->blkdev); + read_unlock(&dev->bdev_mutex); return; } +static void block2mtd_free_bdev(struct block2mtd_dev *dev); static void block2mtd_free_device(struct block2mtd_dev *dev) { @@ -198,32 +233,75 @@ return; kfree(dev->mtd.name); + block2mtd_free_bdev(dev); + kfree(dev); +} +static void block2mtd_free_bdev(struct block2mtd_dev *dev) +{ if (dev->blkdev) { invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping, 0, -1); blkdev_put(dev->blkdev, FMODE_READ|FMODE_WRITE|FMODE_EXCL); + dev->blkdev = NULL; } +} - kfree(dev); +#ifdef TODO +static int block2mtd_refresh(struct mtd_info *mtd) +{ + struct block2mtd_dev *dev = mtd->priv; + struct block_device *bdev; + dev_t devt; + int err = 0; + + /* no other mtd function can run at this point */ + write_lock(&dev->bdev_mutex); + + /* get the device number for the whole disk */ + devt = MKDEV(MAJOR(dev->blkdev->bd_dev), 0); + + /* close the old block device */ + block2mtd_free_bdev(dev); + + /* open the whole disk, issue a partition rescan, then */ + bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ); + if (!bdev || !bdev->bd_disk) + err = -EINVAL; +#ifndef CONFIG_MTD_BLOCK2MTD_MODULE + else + err = rescan_partitions(bdev->bd_disk, bdev); +#endif + if (bdev) + close_bdev_exclusive(bdev, FMODE_READ|FMODE_WRITE); + + /* try to open the partition block device again */ + _open_bdev(dev); + write_unlock(&dev->bdev_mutex); + + return err; } +#endif /* TODO */ /* FIXME: ensure that mtd->size % erase_size == 0 */ -static struct block2mtd_dev *add_device(char *devname, int erase_size) +static struct block2mtd_dev *add_device(char *devname, int erase_size, char *mtdname) { const fmode_t mode = FMODE_READ | FMODE_WRITE | FMODE_EXCL; struct block_device *bdev; struct block2mtd_dev *dev; + struct mtd_partition *part; char *name; if (!devname) return NULL; - dev = kzalloc(sizeof(struct block2mtd_dev), GFP_KERNEL); + dev = kzalloc(sizeof(struct block2mtd_dev) + strlen(devname) + 1, GFP_KERNEL); if (!dev) return NULL; + strcpy(dev->devname, devname); + /* Get a handle on the device */ bdev = blkdev_get_by_path(devname, mode, dev); #ifndef MODULE @@ -233,6 +311,9 @@ to resolve the device name by other means. */ dev_t devt = name_to_dev_t(devname); + + wait_for_device_probe(); + if (devt) bdev = blkdev_get_by_dev(devt, mode, dev); } @@ -250,16 +331,20 @@ } mutex_init(&dev->write_mutex); + rwlock_init(&dev->bdev_mutex); + + if (!mtdname) + mtdname = devname; /* Setup the MTD structure */ /* make the name contain the block device in */ - name = kasprintf(GFP_KERNEL, "block2mtd: %s", devname); + name = kasprintf(GFP_KERNEL, "block2mtd: %s", mtdname); if (!name) goto devinit_err; dev->mtd.name = name; - dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK; + dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1); dev->mtd.erasesize = erase_size; dev->mtd.writesize = 1; dev->mtd.writebufsize = PAGE_SIZE; @@ -272,10 +357,23 @@ dev->mtd.priv = dev; dev->mtd.owner = THIS_MODULE; - if (mtd_device_register(&dev->mtd, NULL, 0)) { +#ifdef TODO + dev->mtd.refresh_device = block2mtd_refresh; +#endif /* TODO */ + + part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL); + BUG_ON(!part); + *part = (struct mtd_partition) { + .offset = 0, + .size = dev->mtd.size, + }; + strcpy((char *)part->name, dev->mtd.name); + + if (mtd_device_register(&dev->mtd, part, 1)) { /* Device didn't get added, so free the entry */ goto devinit_err; } + list_add(&dev->list, &blkmtd_device_list); INFO("mtd%d: [%s] erase_size = %dKiB [%d]", dev->mtd.index, dev->mtd.name + strlen("block2mtd: "), @@ -352,9 +450,9 @@ static int block2mtd_setup2(const char *val) { - char buf[80 + 12]; /* 80 for device, 12 for erase size */ + char buf[80 + 12 + 80]; /* 80 for device, 12 for erase size, 80 for name */ char *str = buf; - char *token[2]; + char *token[3]; char *name; size_t erase_size = PAGE_SIZE; int i, ret; @@ -365,7 +463,7 @@ strcpy(str, val); kill_final_newline(str); - for (i = 0; i < 2; i++) + for (i = 0; i < 3; i++) token[i] = strsep(&str, ","); if (str) @@ -384,8 +482,10 @@ parse_err("illegal erase size"); } } + if (token[2] && (strlen(token[2]) + 1 > 80)) + parse_err("mtd device name too long"); - add_device(name, erase_size); + add_device(name, erase_size, token[2]); return 0; } @@ -419,7 +519,7 @@ module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200); -MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=[,]\""); +MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=[,[,]]\""); static int __init block2mtd_init(void) {