Merge branch 'for-linus-v3.20' of git://git.infradead.org/linux-ubifs (8c988ae7) · Commits · 戴 / test

MAINTAINERS

+2 −7

Original line number	Diff line number	Diff line
		@@ -9990,20 +9990,15 @@ F: drivers/scsi/ufs/

		UNSORTED BLOCK IMAGES (UBI)
		M: Artem Bityutskiy <dedekind1@gmail.com>
		M: Richard Weinberger <richard@nod.at>
		W: http://www.linux-mtd.infradead.org/
		L: linux-mtd@lists.infradead.org
		T: git git://git.infradead.org/ubifs-2.6.git
		S: Maintained
		S: Supported
		F: drivers/mtd/ubi/
		F: include/linux/mtd/ubi.h
		F: include/uapi/mtd/ubi-user.h

		UNSORTED BLOCK IMAGES (UBI) Fastmap
		M: Richard Weinberger <richard@nod.at>
		L: linux-mtd@lists.infradead.org
		S: Maintained
		F: drivers/mtd/ubi/fastmap.c

		USB ACM DRIVER
		M: Oliver Neukum <oliver@neukum.org>
		L: linux-usb@vger.kernel.org

drivers/mtd/ubi/block.c

+123 −124

Original line number	Diff line number	Diff line
		@@ -42,11 +42,12 @@
		#include <linux/list.h>
		#include <linux/mutex.h>
		#include <linux/slab.h>
		#include <linux/vmalloc.h>
		#include <linux/mtd/ubi.h>
		#include <linux/workqueue.h>
		#include <linux/blkdev.h>
		#include <linux/blk-mq.h>
		#include <linux/hdreg.h>
		#include <linux/scatterlist.h>
		#include <asm/div64.h>

		#include "ubi-media.h"
		@@ -67,6 +68,11 @@ struct ubiblock_param {
		char name[UBIBLOCK_PARAM_LEN+1];
		};

		struct ubiblock_pdu {
		struct work_struct work;
		struct ubi_sgl usgl;
		};

		/* Numbers of elements set in the @ubiblock_param array */
		static int ubiblock_devs __initdata;

		@@ -84,11 +90,10 @@ struct ubiblock {
		struct request_queue *rq;

		struct workqueue_struct *wq;
		struct work_struct work;

		struct mutex dev_mutex;
		spinlock_t queue_lock;
		struct list_head list;
		struct blk_mq_tag_set tag_set;
		};

		/* Linked list of all ubiblock instances */
		@@ -181,31 +186,20 @@ static struct ubiblock *find_dev_nolock(int ubi_num, int vol_id)
		return NULL;
		}

		static int ubiblock_read_to_buf(struct ubiblock dev, char buffer,
		int leb, int offset, int len)
		static int ubiblock_read(struct ubiblock_pdu *pdu)
		{
		int ret;

		ret = ubi_read(dev->desc, leb, buffer, offset, len);
		if (ret) {
		dev_err(disk_to_dev(dev->gd), "%d while reading from LEB %d (offset %d, length %d)",
		ret, leb, offset, len);
		return ret;
		}
		return 0;
		}
		int ret, leb, offset, bytes_left, to_read;
		u64 pos;
		struct request *req = blk_mq_rq_from_pdu(pdu);
		struct ubiblock *dev = req->q->queuedata;

		static int ubiblock_read(struct ubiblock dev, char buffer,
		sector_t sec, int len)
		{
		int ret, leb, offset;
		int bytes_left = len;
		int to_read = len;
		u64 pos = sec << 9;
		to_read = blk_rq_bytes(req);
		pos = blk_rq_pos(req) << 9;

		/* Get LEB:offset address to read from */
		offset = do_div(pos, dev->leb_size);
		leb = pos;
		bytes_left = to_read;

		while (bytes_left) {
		/*
		@@ -215,11 +209,10 @@ static int ubiblock_read(struct ubiblock dev, char buffer,
		if (offset + to_read > dev->leb_size)
		to_read = dev->leb_size - offset;

		ret = ubiblock_read_to_buf(dev, buffer, leb, offset, to_read);
		if (ret)
		ret = ubi_read_sg(dev->desc, leb, &pdu->usgl, offset, to_read);
		if (ret < 0)
		return ret;

		buffer += to_read;
		bytes_left -= to_read;
		to_read = bytes_left;
		leb += 1;
		@@ -228,79 +221,6 @@ static int ubiblock_read(struct ubiblock dev, char buffer,
		return 0;
		}

		static int do_ubiblock_request(struct ubiblock dev, struct request req)
		{
		int len, ret;
		sector_t sec;

		if (req->cmd_type != REQ_TYPE_FS)
		return -EIO;

		if (blk_rq_pos(req) + blk_rq_cur_sectors(req) >
		get_capacity(req->rq_disk))
		return -EIO;

		if (rq_data_dir(req) != READ)
		return -ENOSYS; /* Write not implemented */

		sec = blk_rq_pos(req);
		len = blk_rq_cur_bytes(req);

		/*
		* Let's prevent the device from being removed while we're doing I/O
		* work. Notice that this means we serialize all the I/O operations,
		* but it's probably of no impact given the NAND core serializes
		* flash access anyway.
		*/
		mutex_lock(&dev->dev_mutex);
		ret = ubiblock_read(dev, bio_data(req->bio), sec, len);
		mutex_unlock(&dev->dev_mutex);

		return ret;
		}

		static void ubiblock_do_work(struct work_struct *work)
		{
		struct ubiblock *dev =
		container_of(work, struct ubiblock, work);
		struct request_queue *rq = dev->rq;
		struct request *req;
		int res;

		spin_lock_irq(rq->queue_lock);

		req = blk_fetch_request(rq);
		while (req) {

		spin_unlock_irq(rq->queue_lock);
		res = do_ubiblock_request(dev, req);
		spin_lock_irq(rq->queue_lock);

		/*
		* If we're done with this request,
		* we need to fetch a new one
		*/
		if (!__blk_end_request_cur(req, res))
		req = blk_fetch_request(rq);
		}

		spin_unlock_irq(rq->queue_lock);
		}

		static void ubiblock_request(struct request_queue *rq)
		{
		struct ubiblock *dev;
		struct request *req;

		dev = rq->queuedata;

		if (!dev)
		while ((req = blk_fetch_request(rq)) != NULL)
		__blk_end_request_all(req, -ENODEV);
		else
		queue_work(dev->wq, &dev->work);
		}

		static int ubiblock_open(struct block_device *bdev, fmode_t mode)
		{
		struct ubiblock *dev = bdev->bd_disk->private_data;
		@@ -374,6 +294,63 @@ static const struct block_device_operations ubiblock_ops = {
		.getgeo = ubiblock_getgeo,
		};

		static void ubiblock_do_work(struct work_struct *work)
		{
		int ret;
		struct ubiblock_pdu *pdu = container_of(work, struct ubiblock_pdu, work);
		struct request *req = blk_mq_rq_from_pdu(pdu);

		blk_mq_start_request(req);

		/*
		* It is safe to ignore the return value of blk_rq_map_sg() because
		* the number of sg entries is limited to UBI_MAX_SG_COUNT
		* and ubi_read_sg() will check that limit.
		*/
		blk_rq_map_sg(req->q, req, pdu->usgl.sg);

		ret = ubiblock_read(pdu);
		blk_mq_end_request(req, ret);
		}

		static int ubiblock_queue_rq(struct blk_mq_hw_ctx *hctx,
		const struct blk_mq_queue_data *bd)
		{
		struct request *req = bd->rq;
		struct ubiblock *dev = hctx->queue->queuedata;
		struct ubiblock_pdu *pdu = blk_mq_rq_to_pdu(req);

		if (req->cmd_type != REQ_TYPE_FS)
		return BLK_MQ_RQ_QUEUE_ERROR;

		if (rq_data_dir(req) != READ)
		return BLK_MQ_RQ_QUEUE_ERROR; /* Write not implemented */

		ubi_sgl_init(&pdu->usgl);
		queue_work(dev->wq, &pdu->work);

		return BLK_MQ_RQ_QUEUE_OK;
		}

		static int ubiblock_init_request(void data, struct request req,
		unsigned int hctx_idx,
		unsigned int request_idx,
		unsigned int numa_node)
		{
		struct ubiblock_pdu *pdu = blk_mq_rq_to_pdu(req);

		sg_init_table(pdu->usgl.sg, UBI_MAX_SG_COUNT);
		INIT_WORK(&pdu->work, ubiblock_do_work);

		return 0;
		}

		static struct blk_mq_ops ubiblock_mq_ops = {
		.queue_rq = ubiblock_queue_rq,
		.init_request = ubiblock_init_request,
		.map_queue = blk_mq_map_queue,
		};

		int ubiblock_create(struct ubi_volume_info *vi)
		{
		struct ubiblock *dev;
		@@ -417,14 +394,28 @@ int ubiblock_create(struct ubi_volume_info *vi)
		set_capacity(gd, disk_capacity);
		dev->gd = gd;

		spin_lock_init(&dev->queue_lock);
		dev->rq = blk_init_queue(ubiblock_request, &dev->queue_lock);
		if (!dev->rq) {
		dev_err(disk_to_dev(gd), "blk_init_queue failed");
		ret = -ENODEV;
		dev->tag_set.ops = &ubiblock_mq_ops;
		dev->tag_set.queue_depth = 64;
		dev->tag_set.numa_node = NUMA_NO_NODE;
		dev->tag_set.flags = BLK_MQ_F_SHOULD_MERGE;
		dev->tag_set.cmd_size = sizeof(struct ubiblock_pdu);
		dev->tag_set.driver_data = dev;
		dev->tag_set.nr_hw_queues = 1;

		ret = blk_mq_alloc_tag_set(&dev->tag_set);
		if (ret) {
		dev_err(disk_to_dev(dev->gd), "blk_mq_alloc_tag_set failed");
		goto out_put_disk;
		}

		dev->rq = blk_mq_init_queue(&dev->tag_set);
		if (IS_ERR(dev->rq)) {
		dev_err(disk_to_dev(gd), "blk_mq_init_queue failed");
		ret = PTR_ERR(dev->rq);
		goto out_free_tags;
		}
		blk_queue_max_segments(dev->rq, UBI_MAX_SG_COUNT);

		dev->rq->queuedata = dev;
		dev->gd->queue = dev->rq;

		@@ -437,7 +428,6 @@ int ubiblock_create(struct ubi_volume_info *vi)
		ret = -ENOMEM;
		goto out_free_queue;
		}
		INIT_WORK(&dev->work, ubiblock_do_work);

		mutex_lock(&devices_mutex);
		list_add_tail(&dev->list, &ubiblock_devices);
		@@ -451,6 +441,8 @@ int ubiblock_create(struct ubi_volume_info *vi)

		out_free_queue:
		blk_cleanup_queue(dev->rq);
		out_free_tags:
		blk_mq_free_tag_set(&dev->tag_set);
		out_put_disk:
		put_disk(dev->gd);
		out_free_dev:
		@@ -461,8 +453,13 @@ out_free_dev:

		static void ubiblock_cleanup(struct ubiblock *dev)
		{
		/* Stop new requests to arrive */
		del_gendisk(dev->gd);
		/* Flush pending work */
		destroy_workqueue(dev->wq);
		/* Finally destroy the blk queue */
		blk_cleanup_queue(dev->rq);
		blk_mq_free_tag_set(&dev->tag_set);
		dev_info(disk_to_dev(dev->gd), "released");
		put_disk(dev->gd);
		}
		@@ -490,9 +487,6 @@ int ubiblock_remove(struct ubi_volume_info *vi)
		list_del(&dev->list);
		mutex_unlock(&devices_mutex);

		/* Flush pending work and stop this workqueue */
		destroy_workqueue(dev->wq);

		ubiblock_cleanup(dev);
		mutex_unlock(&dev->dev_mutex);
		kfree(dev);
		@@ -583,22 +577,28 @@ open_volume_desc(const char *name, int ubi_num, int vol_id)
		return ubi_open_volume(ubi_num, vol_id, UBI_READONLY);
		}

		static int __init ubiblock_create_from_param(void)
		static void __init ubiblock_create_from_param(void)
		{
		int i, ret;
		int i, ret = 0;
		struct ubiblock_param *p;
		struct ubi_volume_desc *desc;
		struct ubi_volume_info vi;

		/*
		* If there is an error creating one of the ubiblocks, continue on to
		* create the following ubiblocks. This helps in a circumstance where
		* the kernel command-line specifies multiple block devices and some
		* may be broken, but we still want the working ones to come up.
		*/
		for (i = 0; i < ubiblock_devs; i++) {
		p = &ubiblock_param[i];

		desc = open_volume_desc(p->name, p->ubi_num, p->vol_id);
		if (IS_ERR(desc)) {
		pr_err("UBI: block: can't open volume, err=%ld\n",
		PTR_ERR(desc));
		ret = PTR_ERR(desc);
		break;
		pr_err(
		"UBI: block: can't open volume on ubi%d_%d, err=%ld",
		p->ubi_num, p->vol_id, PTR_ERR(desc));
		continue;
		}

		ubi_get_volume_info(desc, &vi);
		@@ -606,12 +606,12 @@ static int __init ubiblock_create_from_param(void)

		ret = ubiblock_create(&vi);
		if (ret) {
		pr_err("UBI: block: can't add '%s' volume, err=%d\n",
		vi.name, ret);
		break;
		pr_err(
		"UBI: block: can't add '%s' volume on ubi%d_%d, err=%d",
		vi.name, p->ubi_num, p->vol_id, ret);
		continue;
		}
		}
		return ret;
		}

		static void ubiblock_remove_all(void)
		@@ -620,8 +620,6 @@ static void ubiblock_remove_all(void)
		struct ubiblock *dev;

		list_for_each_entry_safe(dev, next, &ubiblock_devices, list) {
		/* Flush pending work and stop workqueue */
		destroy_workqueue(dev->wq);
		/* The module is being forcefully removed */
		WARN_ON(dev->desc);
		/* Remove from device list */
		@@ -639,10 +637,12 @@ int __init ubiblock_init(void)
		if (ubiblock_major < 0)
		return ubiblock_major;

		/* Attach block devices from 'block=' module param */
		ret = ubiblock_create_from_param();
		if (ret)
		goto err_remove;
		/*
		* Attach block devices from 'block=' module param.
		* Even if one block device in the param list fails to come up,
		* still allow the module to load and leave any others up.
		*/
		ubiblock_create_from_param();

		/*
		* Block devices are only created upon user requests, so we ignore
		@@ -655,7 +655,6 @@ int __init ubiblock_init(void)

		err_unreg:
		unregister_blkdev(ubiblock_major, "ubiblock");
		err_remove:
		ubiblock_remove_all();
		return ret;
		}

drivers/mtd/ubi/build.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -923,7 +923,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num,

		/* Make sure ubi_num is not busy */
		if (ubi_devices[ubi_num]) {
		ubi_err(ubi, "ubi%d already exists", ubi_num);
		ubi_err(ubi, "already exists");
		return -EEXIST;
		}
		}
		@@ -973,7 +973,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num,
		mutex_init(&ubi->fm_mutex);
		init_rwsem(&ubi->fm_sem);

		ubi_msg(ubi, "attaching mtd%d to ubi%d", mtd->index, ubi_num);
		ubi_msg(ubi, "attaching mtd%d", mtd->index);

		err = io_init(ubi, max_beb_per1024);
		if (err)
		@@ -1428,7 +1428,7 @@ static int __init ubi_mtd_param_parse(const char val, struct kernel_param kp)
		}

		if (len == 0) {
		pr_err("UBI warning: empty 'mtd=' parameter - ignored\n");
		pr_warn("UBI warning: empty 'mtd=' parameter - ignored\n");
		return 0;
		}

drivers/mtd/ubi/cdev.c

+10 −9

Original line number	Diff line number	Diff line
		@@ -48,26 +48,25 @@

		/**
		* get_exclusive - get exclusive access to an UBI volume.
		* @ubi: UBI device description object
		* @desc: volume descriptor
		*
		* This function changes UBI volume open mode to "exclusive". Returns previous
		* mode value (positive integer) in case of success and a negative error code
		* in case of failure.
		*/
		static int get_exclusive(struct ubi_device ubi, struct ubi_volume_desc desc)
		static int get_exclusive(struct ubi_volume_desc *desc)
		{
		int users, err;
		struct ubi_volume *vol = desc->vol;

		spin_lock(&vol->ubi->volumes_lock);
		users = vol->readers + vol->writers + vol->exclusive;
		users = vol->readers + vol->writers + vol->exclusive + vol->metaonly;
		ubi_assert(users > 0);
		if (users > 1) {
		ubi_err(ubi, "%d users for volume %d", users, vol->vol_id);
		ubi_err(vol->ubi, "%d users for volume %d", users, vol->vol_id);
		err = -EBUSY;
		} else {
		vol->readers = vol->writers = 0;
		vol->readers = vol->writers = vol->metaonly = 0;
		vol->exclusive = 1;
		err = desc->mode;
		desc->mode = UBI_EXCLUSIVE;
		@@ -87,13 +86,15 @@ static void revoke_exclusive(struct ubi_volume_desc *desc, int mode)
		struct ubi_volume *vol = desc->vol;

		spin_lock(&vol->ubi->volumes_lock);
		ubi_assert(vol->readers == 0 && vol->writers == 0);
		ubi_assert(vol->readers == 0 && vol->writers == 0 && vol->metaonly == 0);
		ubi_assert(vol->exclusive == 1 && desc->mode == UBI_EXCLUSIVE);
		vol->exclusive = 0;
		if (mode == UBI_READONLY)
		vol->readers = 1;
		else if (mode == UBI_READWRITE)
		vol->writers = 1;
		else if (mode == UBI_METAONLY)
		vol->metaonly = 1;
		else
		vol->exclusive = 1;
		spin_unlock(&vol->ubi->volumes_lock);
		@@ -421,7 +422,7 @@ static long vol_cdev_ioctl(struct file *file, unsigned int cmd,
		break;
		}

		err = get_exclusive(ubi, desc);
		err = get_exclusive(desc);
		if (err < 0)
		break;

		@@ -457,7 +458,7 @@ static long vol_cdev_ioctl(struct file *file, unsigned int cmd,
		req.bytes < 0 \|\| req.lnum >= vol->usable_leb_size)
		break;

		err = get_exclusive(ubi, desc);
		err = get_exclusive(desc);
		if (err < 0)
		break;

		@@ -734,7 +735,7 @@ static int rename_volumes(struct ubi_device *ubi,
		goto out_free;
		}

		re->desc = ubi_open_volume(ubi->ubi_num, vol_id, UBI_READWRITE);
		re->desc = ubi_open_volume(ubi->ubi_num, vol_id, UBI_METAONLY);
		if (IS_ERR(re->desc)) {
		err = PTR_ERR(re->desc);
		ubi_err(ubi, "cannot open volume %d, error %d",

drivers/mtd/ubi/eba.c

+56 −0

Original line number	Diff line number	Diff line
		@@ -426,6 +426,7 @@ retry:
		pnum, vol_id, lnum);
		err = -EBADMSG;
		} else
		err = -EINVAL;
		ubi_ro_mode(ubi);
		}
		goto out_free;
		@@ -479,6 +480,61 @@ out_unlock:
		return err;
		}

		/**
		* ubi_eba_read_leb_sg - read data into a scatter gather list.
		* @ubi: UBI device description object
		* @vol: volume description object
		* @lnum: logical eraseblock number
		* @sgl: UBI scatter gather list to store the read data
		* @offset: offset from where to read
		* @len: how many bytes to read
		* @check: data CRC check flag
		*
		* This function works exactly like ubi_eba_read_leb(). But instead of
		* storing the read data into a buffer it writes to an UBI scatter gather
		* list.
		*/
		int ubi_eba_read_leb_sg(struct ubi_device ubi, struct ubi_volume vol,
		struct ubi_sgl *sgl, int lnum, int offset, int len,
		int check)
		{
		int to_read;
		int ret;
		struct scatterlist *sg;

		for (;;) {
		ubi_assert(sgl->list_pos < UBI_MAX_SG_COUNT);
		sg = &sgl->sg[sgl->list_pos];
		if (len < sg->length - sgl->page_pos)
		to_read = len;
		else
		to_read = sg->length - sgl->page_pos;

		ret = ubi_eba_read_leb(ubi, vol, lnum,
		sg_virt(sg) + sgl->page_pos, offset,
		to_read, check);
		if (ret < 0)
		return ret;

		offset += to_read;
		len -= to_read;
		if (!len) {
		sgl->page_pos += to_read;
		if (sgl->page_pos == sg->length) {
		sgl->list_pos++;
		sgl->page_pos = 0;
		}

		break;
		}

		sgl->list_pos++;
		sgl->page_pos = 0;
		}

		return ret;
		}

		/**
		* recover_peb - recover from write failure.
		* @ubi: UBI device description object

Admin message