UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

IB/srpt: Support HCAs with more than two ports 

Since there are adapters that have four ports, increase the size of
the srpt_device.port[] array. This patch avoids that the following
warning is hit with quad port Chelsio adapters:

    WARN_ON(sdev->device->phys_port_cnt > ARRAY_SIZE(sdev->port));

Reported-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Cc: Steve Wise <swise@opengridcomputing.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: <stable@vger.kernel.org>
Reviewed-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
Bart Van Assche 2018-06-26 15:24:48 -07:00 committed by Jason Gunthorpe
parent 68348441ef
commit e620ebfc22
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/infiniband/ulp/srpt/ib_srpt.c
View File

@ -2970,7 +2970,8 @@ static void srpt_add_one(struct ib_device *device)
pr_debug("device = %p\n", device); pr_debug("device = %p\n", device);
sdev = kzalloc(sizeof(*sdev), GFP_KERNEL); sdev = kzalloc(struct_size(sdev, port, device->phys_port_cnt),
GFP_KERNEL);
if (!sdev) if (!sdev)
goto err; goto err;
@ -3024,8 +3025,6 @@ static void srpt_add_one(struct ib_device *device)
srpt_event_handler); srpt_event_handler);
ib_register_event_handler(&sdev->event_handler); ib_register_event_handler(&sdev->event_handler);
WARN_ON(sdev->device->phys_port_cnt > ARRAY_SIZE(sdev->port));
for (i = 1; i <= sdev->device->phys_port_cnt; i++) { for (i = 1; i <= sdev->device->phys_port_cnt; i++) {
sport = &sdev->port[i - 1]; sport = &sdev->port[i - 1];
INIT_LIST_HEAD(&sport->nexus_list); INIT_LIST_HEAD(&sport->nexus_list);

4
drivers/infiniband/ulp/srpt/ib_srpt.h
View File

@ -396,9 +396,9 @@ struct srpt_port {
* @sdev_mutex: Serializes use_srq changes. * @sdev_mutex: Serializes use_srq changes.
* @use_srq: Whether or not to use SRQ. * @use_srq: Whether or not to use SRQ.
* @ioctx_ring: Per-HCA SRQ. * @ioctx_ring: Per-HCA SRQ.
* @port: Information about the ports owned by this HCA.
* @event_handler: Per-HCA asynchronous IB event handler. * @event_handler: Per-HCA asynchronous IB event handler.
* @list: Node in srpt_dev_list. * @list: Node in srpt_dev_list.
* @port: Information about the ports owned by this HCA.
*/ */
struct srpt_device { struct srpt_device {
struct ib_device *device; struct ib_device *device;
@ -410,9 +410,9 @@ struct srpt_device {
struct mutex sdev_mutex; struct mutex sdev_mutex;
bool use_srq; bool use_srq;
struct srpt_recv_ioctx **ioctx_ring; struct srpt_recv_ioctx **ioctx_ring;
struct srpt_port port[2];
struct ib_event_handler event_handler; struct ib_event_handler event_handler;
struct list_head list; struct list_head list;
struct srpt_port port[];
}; };
#endif /* IB_SRPT_H */ #endif /* IB_SRPT_H */