IB/mthca: Relax UAR size check
Subsystems (2)
PATCH 1/4 IB/mthca: Relax UAR size check
There are some cards around that have UAR (user access region) size different from 8 MB. Relax our sanity check to make sure that the PCI BAR is big enough to access the UAR size reported by the device firmware instead.
---
drivers/infiniband/hw/mthca/mthca_main.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-)
cbd2981a97cb628431a987a8abd1731c74bcc32e
drivers/infiniband/hw/mthca/mthca_main.c +8 -2
@@ -155,6 +155,13 @@ static int __devinit mthca_dev_lim(strucreturn -ENODEV ; } +if (dev_lim->uar_size >pci_resource_len (mdev->pdev,2 )) { +mthca_err (mdev,"HCA reported UAR size of 0x%x bigger than " +"PCI resource 2 size of 0x%lx, aborting.\n" , + dev_lim->uar_size,pci_resource_len (mdev->pdev,2 )); +return -ENODEV ; + } + mdev->limits.num_ports = dev_lim->num_ports; mdev->limits.vl_cap = dev_lim->max_vl; mdev->limits.mtu_cap = dev_lim->max_mtu;
@@ -976,8 +983,7 @@ static int __devinit mthca_init_one(stru err = -ENODEV ; goto err_disable_pdev; } -if (!(pci_resource_flags (pdev,2 ) &IORESOURCE_MEM ) || -pci_resource_len (pdev,2 ) !=1 <<23 ) { +if (!(pci_resource_flags (pdev,2 ) &IORESOURCE_MEM )) {dev_err (&pdev->dev,"Missing UAR, aborting.\n" ); err = -ENODEV ; goto err_disable_pdev;
Signature · 1 line
1.1.3
PATCH 2/4 IB/srp: Semaphore to mutex conversion
Convert srp_host->target_mutex from a semaphore to a mutex.
---
drivers/infiniband/ulp/srp/ib_srp.c | 14 +++++++------- drivers/infiniband/ulp/srp/ib_srp.h | 5 ++--- 2 files changed, 9 insertions(+), 10 deletions(-)
8e9e5f4f5eb1d44ddabfd1ddea4ca4e4244a9ffb
drivers/infiniband/ulp/srp/ib_srp.c +7 -7
@@ -357,9 +357,9 @@ static void srp_remove_work(void *target target->state =SRP_TARGET_REMOVED ;spin_unlock_irq (target->scsi_host->host_lock); -down (&target->srp_host->target_mutex); +mutex_lock (&target->srp_host->target_mutex);list_del (&target->list); -up (&target->srp_host->target_mutex); +mutex_unlock (&target->srp_host->target_mutex);scsi_remove_host (target->scsi_host);ib_destroy_cm_id (target->cm_id);
@@ -1254,9 +1254,9 @@ static int srp_add_target(struct srp_hosif (scsi_add_host (target->scsi_host, host->dev->dma_device))return -ENODEV ; -down (&host->target_mutex); +mutex_lock (&host->target_mutex);list_add_tail (&target->list, &host->target_list); -up (&host->target_mutex); +mutex_unlock (&host->target_mutex); target->state =SRP_TARGET_LIVE ;
@@ -1525,7 +1525,7 @@ static struct srp_host *srp_add_port(strreturn NULL ;INIT_LIST_HEAD (&host->target_list); -init_MUTEX (&host->target_mutex); +mutex_init (&host->target_mutex);init_completion (&host->released); host->dev = device; host->port = port;
@@ -1626,7 +1626,7 @@ static void srp_remove_one(struct ib_dev* Mark all target ports as removed, so we stop queueing * commands and don't try to reconnect. */ -down (&host->target_mutex); +mutex_lock (&host->target_mutex);list_for_each_entry_safe (target, tmp_target, &host->target_list, list) {spin_lock_irqsave (target->scsi_host->host_lock, flags);
@@ -1634,7 +1634,7 @@ static void srp_remove_one(struct ib_dev target->state =SRP_TARGET_REMOVED ;spin_unlock_irqrestore (target->scsi_host->host_lock, flags); } -up (&host->target_mutex); +mutex_unlock (&host->target_mutex);/* * Wait for any reconnection tasks that may have
drivers/infiniband/ulp/srp/ib_srp.h +2 -3
@@ -37,8 +37,7 @@#include <linux/types.h> #include <linux/list.h> - -#include <asm/semaphore.h> +#include <linux/mutex.h> #include <scsi/scsi_host.h> #include <scsi/scsi_cmnd.h>
@@ -85,7 +84,7 @@ struct srp_host {struct ib_mr *mr;struct class_device class_dev;struct list_head target_list; -struct semaphore target_mutex; +struct mutex target_mutex;struct completion released;struct list_head list; };
Signature · 1 line
1.1.3
PATCH 3/4 IB/mthca: Don't cancel commands on a signal
We have run into the following problem: if a task receives a signal while in the process of e.g. destroying a resource (which could be because the relevant file was closed) mthca could bail out from trying to take a command interface semaphore without performing the appropriate command to tell hardware that the resource is being destroyed.
As a result we see messages like
ib_mthca 0000:04:00.0: HW2SW_CQ failed (-4)
In this case, hardware could access the resource after the memory has been freed, possibly causing memory corruption.
A simple solution is to replace down_interruptible() by down() in command interface activation.
[ It's also not safe to bail out on multicast table operations, since
they may be invoked on the cleanup path too. So use down() for mcg_table.sem too. ]
---
drivers/infiniband/hw/mthca/mthca_cmd.c | 9 +++------ drivers/infiniband/hw/mthca/mthca_mcg.c | 14 ++++---------- 2 files changed, 7 insertions(+), 16 deletions(-)
e3aa31c517cb6fd0a3d8b23e6a7e71a6aafc2393
drivers/infiniband/hw/mthca/mthca_cmd.c +3 -6
@@ -199,8 +199,7 @@ static int mthca_cmd_post(struct mthca_d {int err =0 ; -if (down_interruptible (&dev->cmd.hcr_sem)) -return -EINTR ; +down (&dev->cmd.hcr_sem);if (event) {unsigned long end = jiffies +GO_BIT_TIMEOUT ;
@@ -255,8 +254,7 @@ static int mthca_cmd_poll(struct mthca_dint err =0 ;unsigned long end; -if (down_interruptible (&dev->cmd.poll_sem)) -return -EINTR ; +down (&dev->cmd.poll_sem); err = mthca_cmd_post(dev, in_param, out_param ? *out_param : 0,
@@ -333,8 +331,7 @@ static int mthca_cmd_wait(struct mthca_dint err =0 ;struct mthca_cmd_context *context; -if (down_interruptible (&dev->cmd.event_sem)) -return -EINTR ; +down (&dev->cmd.event_sem);spin_lock (&dev->cmd.context_lock);BUG_ON (dev->cmd.free_head <0 );
drivers/infiniband/hw/mthca/mthca_mcg.c +4 -10
@@ -154,10 +154,7 @@ int mthca_multicast_attach(struct ib_qpreturn PTR_ERR (mailbox); mgm = mailbox->buf; -if (down_interruptible (&dev->mcg_table.sem)) { - err = -EINTR ; - goto err_sem; - } +down (&dev->mcg_table.sem); err =find_mgm (dev, gid->raw, mailbox, &hash, &prev, &index);if (err)
@@ -242,7 +239,7 @@ int mthca_multicast_attach(struct ib_qpmthca_free (&dev->mcg_table.alloc, index); }up (&dev->mcg_table.sem); - err_sem: +mthca_free_mailbox (dev, mailbox);return err; }
@@ -263,10 +260,7 @@ int mthca_multicast_detach(struct ib_qpreturn PTR_ERR (mailbox); mgm = mailbox->buf; -if (down_interruptible (&dev->mcg_table.sem)) { - err = -EINTR ; - goto err_sem; - } +down (&dev->mcg_table.sem); err =find_mgm (dev, gid->raw, mailbox, &hash, &prev, &index);if (err)
@@ -372,7 +366,7 @@ int mthca_multicast_detach(struct ib_qp out:up (&dev->mcg_table.sem); - err_sem: +mthca_free_mailbox (dev, mailbox);return err; }
Signature · 1 line
1.1.3
PATCH 4/4 IB/mthca: Semaphore to mutex conversions
Convert semaphores to mutexes in mthca. Leave firmware command interface poll_sem and event_sem as semaphores.
---
drivers/infiniband/hw/mthca/mthca_cmd.c | 6 ++-- drivers/infiniband/hw/mthca/mthca_dev.h | 8 ++++-- drivers/infiniband/hw/mthca/mthca_mcg.c | 10 ++++--- drivers/infiniband/hw/mthca/mthca_memfree.c | 36 +++++++++++++------------- drivers/infiniband/hw/mthca/mthca_memfree.h | 7 ++--- drivers/infiniband/hw/mthca/mthca_provider.c | 6 ++-- 6 files changed, 37 insertions(+), 36 deletions(-)
fd9cfdd11be3b37b5c919b64b43990f14a1587bd
drivers/infiniband/hw/mthca/mthca_cmd.c +3 -3
@@ -199,7 +199,7 @@ static int mthca_cmd_post(struct mthca_d {int err =0 ; -down (&dev->cmd.hcr_sem); +mutex_lock (&dev->cmd.hcr_mutex);if (event) {unsigned long end = jiffies +GO_BIT_TIMEOUT ;
@@ -237,7 +237,7 @@ static int mthca_cmd_post(struct mthca_d op), dev->hcr + 6 * 4); out: -up (&dev->cmd.hcr_sem); +mutex_unlock (&dev->cmd.hcr_mutex);return err; }
@@ -435,7 +435,7 @@ static int mthca_cmd_imm(struct mthca_deint mthca_cmd_init (struct mthca_dev *dev) { -sema_init (&dev->cmd.hcr_sem,1 ); +mutex_init (&dev->cmd.hcr_mutex);sema_init (&dev->cmd.poll_sem,1 ); dev->cmd.use_events =0 ;
drivers/infiniband/hw/mthca/mthca_dev.h +5 -3
@@ -44,6 +44,8 @@#include <linux/pci.h> #include <linux/dma-mapping.h> #include <linux/timer.h> +#include <linux/mutex.h> +#include <asm/semaphore.h> #include "mthca_provider.h"
@@ -111,7 +113,7 @@ enum {struct mthca_cmd {struct pci_pool *pool;int use_events; -struct semaphore hcr_sem; +struct mutex hcr_mutex;struct semaphore poll_sem;struct semaphore event_sem;int max_cmds;
@@ -256,7 +258,7 @@ struct mthca_av_table { };struct mthca_mcg_table { -struct semaphore sem; +struct mutex mutex;struct mthca_alloc alloc;struct mthca_icm_table *table; };
@@ -301,7 +303,7 @@ struct mthca_dev {u64 ddr_end;MTHCA_DECLARE_DOORBELL_LOCK (doorbell_lock) - struct semaphore cap_mask_mutex; + struct mutex cap_mask_mutex;void __iomem *hcr;void __iomem *kar;
drivers/infiniband/hw/mthca/mthca_mcg.c +5 -5
@@ -154,7 +154,7 @@ int mthca_multicast_attach(struct ib_qpreturn PTR_ERR (mailbox); mgm = mailbox->buf; -down (&dev->mcg_table.sem); +mutex_lock (&dev->mcg_table.mutex); err =find_mgm (dev, gid->raw, mailbox, &hash, &prev, &index);if (err)
@@ -238,7 +238,7 @@ int mthca_multicast_attach(struct ib_qpBUG_ON (index < dev->limits.num_mgms);mthca_free (&dev->mcg_table.alloc, index); } -up (&dev->mcg_table.sem); +mutex_unlock (&dev->mcg_table.mutex);mthca_free_mailbox (dev, mailbox);return err;
@@ -260,7 +260,7 @@ int mthca_multicast_detach(struct ib_qpreturn PTR_ERR (mailbox); mgm = mailbox->buf; -down (&dev->mcg_table.sem); +mutex_lock (&dev->mcg_table.mutex); err =find_mgm (dev, gid->raw, mailbox, &hash, &prev, &index);if (err)
@@ -365,7 +365,7 @@ int mthca_multicast_detach(struct ib_qp } out: -up (&dev->mcg_table.sem); +mutex_unlock (&dev->mcg_table.mutex);mthca_free_mailbox (dev, mailbox);return err;
@@ -383,7 +383,7 @@ int __devinit mthca_init_mcg_table(strucif (err)return err; -init_MUTEX (&dev->mcg_table.sem); +mutex_init (&dev->mcg_table.mutex);return 0 ; }
drivers/infiniband/hw/mthca/mthca_memfree.c +18 -18
@@ -50,7 +50,7 @@ enum { };struct mthca_user_db_table { -struct semaphore mutex; +struct mutex mutex;struct {u64 uvirt;struct scatterlist mem;
@@ -158,7 +158,7 @@ int mthca_table_get(struct mthca_dev *deint ret =0 ;u8 status; -down (&table->mutex); +mutex_lock (&table->mutex);if (table->icm[i]) { ++table->icm[i]->refcount;
@@ -184,7 +184,7 @@ int mthca_table_get(struct mthca_dev *de ++table->icm[i]->refcount; out: -up (&table->mutex); +mutex_unlock (&table->mutex);return ret; }
@@ -198,7 +198,7 @@ void mthca_table_put(struct mthca_dev *d i = (obj & (table->num_obj -1 )) * table->obj_size /MTHCA_TABLE_CHUNK_SIZE ; -down (&table->mutex); +mutex_lock (&table->mutex);if (--table->icm[i]->refcount ==0 ) { mthca_UNMAP_ICM(dev, table->virt + i * MTHCA_TABLE_CHUNK_SIZE,
@@ -207,7 +207,7 @@ void mthca_table_put(struct mthca_dev *d table->icm[i] =NULL ; } -up (&table->mutex); +mutex_unlock (&table->mutex); }void *mthca_table_find (struct mthca_icm_table *table,int obj)
@@ -220,7 +220,7 @@ void *mthca_table_find(struct mthca_icm_if (!table->lowmem)return NULL ; -down (&table->mutex); +mutex_lock (&table->mutex); idx = (obj & (table->num_obj -1 )) * table->obj_size; icm = table->icm[idx /MTHCA_TABLE_CHUNK_SIZE ];
@@ -240,7 +240,7 @@ void *mthca_table_find(struct mthca_icm_ } out: -up (&table->mutex); +mutex_unlock (&table->mutex);return page ?lowmem_page_address (page) + offset :NULL ; }
@@ -301,7 +301,7 @@ struct mthca_icm_table *mthca_alloc_icm_ table->num_obj = nobj; table->obj_size = obj_size; table->lowmem = use_lowmem; -init_MUTEX (&table->mutex); +mutex_init (&table->mutex);for (i =0 ; i < num_icm; ++i) table->icm[i] =NULL ;
@@ -380,7 +380,7 @@ int mthca_map_user_db(struct mthca_dev *if (index <0 || index > dev->uar_table.uarc_size /8 )return -EINVAL ; -down (&db_tab->mutex); +mutex_lock (&db_tab->mutex); i = index /MTHCA_DB_REC_PER_PAGE ;
@@ -424,7 +424,7 @@ int mthca_map_user_db(struct mthca_dev * db_tab->page[i].refcount =1 ; out: -up (&db_tab->mutex); +mutex_unlock (&db_tab->mutex);return ret; }
@@ -439,11 +439,11 @@ void mthca_unmap_user_db(struct mthca_de* pages until we clean up the whole db table. */ -down (&db_tab->mutex); +mutex_lock (&db_tab->mutex); --db_tab->page[index /MTHCA_DB_REC_PER_PAGE ].refcount; -up (&db_tab->mutex); +mutex_unlock (&db_tab->mutex); }struct mthca_user_db_table *mthca_init_user_db_tab (struct mthca_dev *dev)
@@ -460,7 +460,7 @@ struct mthca_user_db_table *mthca_init_uif (!db_tab)return ERR_PTR (-ENOMEM ); -init_MUTEX (&db_tab->mutex); +mutex_init (&db_tab->mutex);for (i =0 ; i < npages; ++i) { db_tab->page[i].refcount =0 ; db_tab->page[i].uvirt =0 ;
@@ -499,7 +499,7 @@ int mthca_alloc_db(struct mthca_dev *devint ret =0 ;u8 status; -down (&dev->db_tab->mutex); +mutex_lock (&dev->db_tab->mutex);switch (type) {case MTHCA_DB_TYPE_CQ_ARM :
@@ -585,7 +585,7 @@ found: *db = (__be32 *) &page->db_rec[j]; out: -up (&dev->db_tab->mutex); +mutex_unlock (&dev->db_tab->mutex);return ret; }
@@ -601,7 +601,7 @@ void mthca_free_db(struct mthca_dev *dev page = dev->db_tab->page + i; -down (&dev->db_tab->mutex); +mutex_lock (&dev->db_tab->mutex); page->db_rec[j] =0 ;if (i >= dev->db_tab->min_group2)
@@ -624,7 +624,7 @@ void mthca_free_db(struct mthca_dev *dev ++dev->db_tab->min_group2; } -up (&dev->db_tab->mutex); +mutex_unlock (&dev->db_tab->mutex); }int mthca_init_db_tab (struct mthca_dev *dev)
@@ -638,7 +638,7 @@ int mthca_init_db_tab(struct mthca_dev *if (!dev->db_tab)return -ENOMEM ; -init_MUTEX (&dev->db_tab->mutex); +mutex_init (&dev->db_tab->mutex); dev->db_tab->npages = dev->uar_table.uarc_size /4096 ; dev->db_tab->max_group1 =0 ;
drivers/infiniband/hw/mthca/mthca_memfree.h +3 -4
@@ -39,8 +39,7 @@#include <linux/list.h> #include <linux/pci.h> - -#include <asm/semaphore.h> +#include <linux/mutex.h> #define MTHCA_ICM_CHUNK_LEN \ ((256 - sizeof (struct list_head) - 2 * sizeof (int)) / \
@@ -64,7 +63,7 @@ struct mthca_icm_table {int num_obj;int obj_size;int lowmem; -struct semaphore mutex; +struct mutex mutex;struct mthca_icm *icm[0 ]; };
@@ -147,7 +146,7 @@ struct mthca_db_table {int max_group1;int min_group2;struct mthca_db_page *page; -struct semaphore mutex; +struct mutex mutex; };enum mthca_db_type {
drivers/infiniband/hw/mthca/mthca_provider.c +3 -3
@@ -185,7 +185,7 @@ static int mthca_modify_port(struct ib_dint err;u8 status; -if (down_interruptible (&to_mdev (ibdev)->cap_mask_mutex)) +if (mutex_lock_interruptible (&to_mdev (ibdev)->cap_mask_mutex))return -ERESTARTSYS ; err =mthca_query_port (ibdev, port, &attr);
@@ -207,7 +207,7 @@ static int mthca_modify_port(struct ib_d } out: -up (&to_mdev (ibdev)->cap_mask_mutex); +mutex_unlock (&to_mdev (ibdev)->cap_mask_mutex);return err; }
@@ -1185,7 +1185,7 @@ int mthca_register_device(struct mthca_d dev->ib_dev.post_recv = mthca_tavor_post_receive; } -init_MUTEX (&dev->cap_mask_mutex); +mutex_init (&dev->cap_mask_mutex); ret =ib_register_device (&dev->ib_dev);if (ret)
Signature · 1 line
1.1.3