[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1338231125-9005-1-git-send-email-cascardo@linux.vnet.ibm.com>
Date: Mon, 28 May 2012 15:52:05 -0300
From: Thadeu Lima de Souza Cascardo <cascardo@...ux.vnet.ibm.com>
To: Venkat Venkatsubra <venkat.x.venkatsubra@...cle.com>
Cc: netdev@...r.kernel.org, "David S. Miller" <davem@...emloft.net>,
Thadeu Lima de Souza Cascardo <cascardo@...ux.vnet.ibm.com>,
dledford@...hat.com, Jes.Sorensen@...hat.com
Subject: [PATCH resend] rds_rdma: don't assume infiniband device is PCI
RDS code assumes that the struct ib_device dma_device member, which is a
pointer, points to a struct device embedded in a struct pci_dev.
This is not the case for ehca, for example, which is a OF driver, and
makes dma_device point to a struct device embedded in a struct
platform_device.
This will make the system crash when rds_rdma is loaded in a system
with ehca, since it will try to access the bus member of a non-existent
struct pci_dev.
The only reason rds_rdma uses the struct pci_dev is to get the NUMA node
the device is attached to. Using dev_to_node for that is much better,
since it won't assume which bus the infiniband is attached to.
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@...ux.vnet.ibm.com>
Cc: dledford@...hat.com
Cc: Jes.Sorensen@...hat.com
Cc: Venkat Venkatsubra <venkat.x.venkatsubra@...cle.com>
---
Hi, Venkat.
This patch is still not applied. Can you give your Ack?
Regards.
Cascardo.
---
net/rds/ib.h | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/net/rds/ib.h b/net/rds/ib.h
index edfaaaf..8d2b3d5 100644
--- a/net/rds/ib.h
+++ b/net/rds/ib.h
@@ -186,8 +186,7 @@ struct rds_ib_device {
struct work_struct free_work;
};
-#define pcidev_to_node(pcidev) pcibus_to_node(pcidev->bus)
-#define ibdev_to_node(ibdev) pcidev_to_node(to_pci_dev(ibdev->dma_device))
+#define ibdev_to_node(ibdev) dev_to_node(ibdev->dma_device)
#define rdsibdev_to_node(rdsibdev) ibdev_to_node(rdsibdev->dev)
/* bits for i_ack_flags */
--
1.7.4.4
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists