InfiniBand: small post 2.6.17-rc1 fixes
Subsystems (2)
Linus, please pull from
master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This tree is also available from kernel.org mirrors at:
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
The pull will get the following changes:
Michael S. Tsirkin:
IB/mad: fix oops in cancel_mads
Roland Dreier:
IPoIB: Always build debugging code unless CONFIG_EMBEDDED=y IB/mthca: Always build debugging code unless CONFIG_EMBEDDED=y IB/srp: Fix memory leak in options parsing
drivers/infiniband/core/mad.c | 2 +- drivers/infiniband/hw/mthca/Kconfig | 11 ++++++----- drivers/infiniband/hw/mthca/Makefile | 4 ---- drivers/infiniband/hw/mthca/mthca_dev.h | 17 +++++++++++++++-- drivers/infiniband/hw/mthca/mthca_main.c | 8 ++++++++ drivers/infiniband/ulp/ipoib/Kconfig | 3 ++- drivers/infiniband/ulp/srp/ib_srp.c | 1 + 7 files changed, 33 insertions(+), 13 deletions(-)
drivers/infiniband/core/mad.c +1 -1
@@ -2311,6 +2311,7 @@ static void local_completions(void *data local =list_entry (mad_agent_priv->local_list.next, struct ib_mad_local_private, completion_list); +list_del (&local->completion_list);spin_unlock_irqrestore (&mad_agent_priv->lock, flags);if (local->mad_priv) { recv_mad_agent = local->recv_mad_agent;
@@ -2362,7 +2363,6 @@ local_send_completion: &mad_send_wc);spin_lock_irqsave (&mad_agent_priv->lock, flags); -list_del (&local->completion_list);atomic_dec (&mad_agent_priv->refcount);if (!recv)kmem_cache_free (ib_mad_cache, local->mad_priv);
drivers/infiniband/hw/mthca/Kconfig +6 -5
@@ -7,10 +7,11 @@ config INFINIBAND_MTHCA ("Tavor") and the MT25208 PCI Express HCA ("Arbel"). config INFINIBAND_MTHCA_DEBUG - bool "Verbose debugging output" + bool "Verbose debugging output" if EMBEDDED depends on INFINIBAND_MTHCA - default n + default y ---help--- - This option causes the mthca driver produce a bunch of debug - messages. Select this is you are developing the driver or - trying to diagnose a problem. + This option causes debugging code to be compiled into the + mthca driver. The output can be turned on via the + debug_level module parameter (which can also be set after + the driver is loaded through sysfs).
drivers/infiniband/hw/mthca/Makefile +0 -4
@@ -1,7 +1,3 @@ -ifdef CONFIG_INFINIBAND_MTHCA_DEBUG -EXTRA_CFLAGS += -DDEBUG -endif - obj-$(CONFIG_INFINIBAND_MTHCA) += ib_mthca.o ib_mthca-y := mthca_main.o mthca_cmd.o mthca_profile.o mthca_reset.o \
drivers/infiniband/hw/mthca/mthca_dev.h +15 -2
@@ -355,8 +355,21 @@ struct mthca_dev {spinlock_t sm_lock; }; -#define mthca_dbg(mdev, format, arg...) \ - dev_dbg(&mdev->pdev->dev, format, ## arg) +#ifdef CONFIG_INFINIBAND_MTHCA_DEBUG +extern int mthca_debug_level; + +#define mthca_dbg(mdev, format, arg...) \ + do { \ + if (mthca_debug_level) \ + dev_printk(KERN_DEBUG, &mdev->pdev->dev, format, ## arg); \ + } while (0) + +#else /* CONFIG_INFINIBAND_MTHCA_DEBUG */ + +#define mthca_dbg(mdev, format, arg...) do { (void) mdev; } while (0) + +#endif /* CONFIG_INFINIBAND_MTHCA_DEBUG */ + #define mthca_err(mdev, format, arg...) \ dev_err(&mdev->pdev->dev, format, ## arg) #define mthca_info(mdev, format, arg...) \
drivers/infiniband/hw/mthca/mthca_main.c +8 -0
@@ -52,6 +52,14 @@ MODULE_DESCRIPTION("Mellanox InfiniBandMODULE_LICENSE ("Dual BSD/GPL" );MODULE_VERSION (DRV_VERSION ); +#ifdef CONFIG_INFINIBAND_MTHCA_DEBUG + +int mthca_debug_level =0 ; +module_param_named (debug_level, mthca_debug_level, int,0644 ); +MODULE_PARM_DESC (debug_level,"Enable debug tracing if > 0" ); + +#endif /* CONFIG_INFINIBAND_MTHCA_DEBUG */ +#ifdef CONFIG_PCI_MSI static int msi_x =0 ;
drivers/infiniband/ulp/ipoib/Kconfig +2 -1
@@ -10,8 +10,9 @@ config INFINIBAND_IPOIB group: <http://www.ietf.org/html.charters/ipoib-charter.html>. config INFINIBAND_IPOIB_DEBUG - bool "IP-over-InfiniBand debugging" + bool "IP-over-InfiniBand debugging" if EMBEDDED depends on INFINIBAND_IPOIB + default y ---help--- This option causes debugging code to be compiled into the IPoIB driver. The output can be turned on via the
drivers/infiniband/ulp/srp/ib_srp.c +1 -0
@@ -1434,6 +1434,7 @@ static int srp_parse_options(const char p =match_strdup (args);if (strlen (p) !=32 ) { printk(KERN_WARNING PFX "bad dest GID parameter '%s'\n", p); +kfree (p); goto out; }