Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0c6ffbc authored by Thadeu Lima de Souza Cascardo's avatar Thadeu Lima de Souza Cascardo Committed by David S. Miller
Browse files

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: default avatarThadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
Cc: dledford@redhat.com
Cc: Jes.Sorensen@redhat.com
Cc: Venkat Venkatsubra <venkat.x.venkatsubra@oracle.com>
Acked-by: default avatarVenkat Venkatsubra <venkat.x.venkatsubra@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c51ce497

net/rds/ib.h

+1 −2
Original line number Diff line number Diff line
@@ -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 */