NVMe: Check returns from nvme_alloc_queue()

[linux-2.6-block.git] / drivers / block / nvme.c

diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c
index f44d6cd87ea266648b52e6604d2c16cb31c5bca4..dc821776be949d8b2b298ce265bc413c14133c54 100644 (file)
--- a/drivers/block/nvme.c
+++ b/drivers/block/nvme.c
@@ -48,7 +48,6 @@ module_param(nvme_major, int, 0);
  * Represents an NVM Express device.  Each nvme_dev is a PCI function.
  */
 struct nvme_dev {
-       struct list_head node;
        struct nvme_queue **queues;
        u32 __iomem *dbs;
        struct pci_dev *pci_dev;
@@ -58,6 +57,9 @@ struct nvme_dev {
        struct msix_entry *entry;
        struct nvme_bar __iomem *bar;
        struct list_head namespaces;
+       char serial[20];
+       char model[40];
+       char firmware_rev[8];
 };
 
 /*
@@ -617,6 +619,9 @@ static __devinit struct nvme_queue *nvme_create_queue(struct nvme_dev *dev,
        int result;
        struct nvme_queue *nvmeq = nvme_alloc_queue(dev, qid, cq_size, vector);
 
+       if (!nvmeq)
+               return NULL;
+
        result = adapter_alloc_cq(dev, qid, nvmeq);
        if (result < 0)
                goto free_nvmeq;
@@ -653,6 +658,8 @@ static int __devinit nvme_configure_admin_queue(struct nvme_dev *dev)
        dev->dbs = ((void __iomem *)dev->bar) + 4096;
 
        nvmeq = nvme_alloc_queue(dev, 0, 64, 0);
+       if (!nvmeq)
+               return -ENOMEM;
 
        aqa = nvmeq->q_depth - 1;
        aqa |= aqa << 16;
@@ -780,6 +787,47 @@ static int nvme_get_range_type(struct nvme_ns *ns, unsigned long addr)
        return nvme_submit_user_admin_command(ns->dev, addr, 4096, &c);
 }
 
+static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio)
+{
+       struct nvme_dev *dev = ns->dev;
+       struct nvme_queue *nvmeq;
+       struct nvme_user_io io;
+       struct nvme_command c;
+       unsigned length;
+       u32 result;
+       int nents, status;
+       struct scatterlist *sg;
+
+       if (copy_from_user(&io, uio, sizeof(io)))
+               return -EFAULT;
+       length = io.nblocks << io.block_shift;
+       nents = nvme_map_user_pages(dev, io.opcode & 1, io.addr, length, &sg);
+       if (nents < 0)
+               return nents;
+
+       memset(&c, 0, sizeof(c));
+       c.rw.opcode = io.opcode;
+       c.rw.flags = io.flags;
+       c.rw.nsid = cpu_to_le32(io.nsid);
+       c.rw.slba = cpu_to_le64(io.slba);
+       c.rw.length = cpu_to_le16(io.nblocks - 1);
+       c.rw.control = cpu_to_le16(io.control);
+       c.rw.dsmgmt = cpu_to_le16(io.dsmgmt);
+       c.rw.reftag = cpu_to_le32(io.reftag);   /* XXX: endian? */
+       c.rw.apptag = cpu_to_le16(io.apptag);
+       c.rw.appmask = cpu_to_le16(io.appmask);
+       /* XXX: metadata */
+       nvme_setup_prps(&c.common, sg, length);
+
+       nvmeq = get_nvmeq(ns);
+       status = nvme_submit_sync_cmd(nvmeq, &c, &result);
+       put_nvmeq(nvmeq);
+
+       nvme_unmap_user_pages(dev, io.opcode & 1, io.addr, length, sg, nents);
+       put_user(result, &uio->result);
+       return status;
+}
+
 static int nvme_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd,
                                                        unsigned long arg)
 {
@@ -792,6 +840,8 @@ static int nvme_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd,
                return nvme_identify(ns, arg, 1);
        case NVME_IOCTL_GET_RANGE_TYPE:
                return nvme_get_range_type(ns, arg);
+       case NVME_IOCTL_SUBMIT_IO:
+               return nvme_submit_io(ns, (void __user *)arg);
        default:
                return -ENOTTY;
        }
@@ -936,6 +986,7 @@ static int __devinit nvme_dev_add(struct nvme_dev *dev)
 {
        int res, nn, i;
        struct nvme_ns *ns, *next;
+       struct nvme_id_ctrl *ctrl;
        void *id;
        dma_addr_t dma_addr;
        struct nvme_command cid, crt;
@@ -960,7 +1011,11 @@ static int __devinit nvme_dev_add(struct nvme_dev *dev)
                goto out_free;
        }
 
-       nn = le32_to_cpup(&((struct nvme_id_ctrl *)id)->nn);
+       ctrl = id;
+       nn = le32_to_cpup(&ctrl->nn);
+       memcpy(dev->serial, ctrl->sn, sizeof(ctrl->sn));
+       memcpy(dev->model, ctrl->mn, sizeof(ctrl->mn));
+       memcpy(dev->firmware_rev, ctrl->fr, sizeof(ctrl->fr));
 
        cid.identify.cns = 0;
        memset(&crt, 0, sizeof(crt));