lkml.org 
[lkml]   [2018]   [Sep]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 044/145] IB/srpt: Support HCAs with more than two ports
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Bart Van Assche <bart.vanassche@wdc.com>

    commit e620ebfc228dcbef7519e3d16f43c6c6f1a1d0cb upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/infiniband/ulp/srpt/ib_srpt.c | 5 ++---
    drivers/infiniband/ulp/srpt/ib_srpt.h | 4 ++--
    2 files changed, 4 insertions(+), 5 deletions(-)

    --- a/drivers/infiniband/ulp/srpt/ib_srpt.c
    +++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
    @@ -2983,7 +2983,8 @@ static void srpt_add_one(struct ib_devic

    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)
    goto err;

    @@ -3037,8 +3038,6 @@ static void srpt_add_one(struct ib_devic
    srpt_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++) {
    sport = &sdev->port[i - 1];
    INIT_LIST_HEAD(&sport->nexus_list);
    --- a/drivers/infiniband/ulp/srpt/ib_srpt.h
    +++ b/drivers/infiniband/ulp/srpt/ib_srpt.h
    @@ -396,9 +396,9 @@ struct srpt_port {
    * @sdev_mutex: Serializes use_srq changes.
    * @use_srq: Whether or not to use SRQ.
    * @ioctx_ring: Per-HCA SRQ.
    - * @port: Information about the ports owned by this HCA.
    * @event_handler: Per-HCA asynchronous IB event handler.
    * @list: Node in srpt_dev_list.
    + * @port: Information about the ports owned by this HCA.
    */
    struct srpt_device {
    struct ib_device *device;
    @@ -410,9 +410,9 @@ struct srpt_device {
    struct mutex sdev_mutex;
    bool use_srq;
    struct srpt_recv_ioctx **ioctx_ring;
    - struct srpt_port port[2];
    struct ib_event_handler event_handler;
    struct list_head list;
    + struct srpt_port port[];
    };

    #endif /* IB_SRPT_H */

    \
     
     \ /
      Last update: 2018-09-07 23:23    [W:3.242 / U:0.504 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site