Looks Good
Reviewed-By: Devesh Sharma <devesh.sharma@xxxxxxxxxxxxx>
On Thu, Oct 15, 2015 at 9:08 PM, Matan Barak <matanb@xxxxxxxxxxxx> wrote:
> Previously, the CM has searched the cache for any sgid_index whose
> GID matches the path's GID. Since the path record stores the net
> device, the CM should now search only for GIDs which originated from
> this net device.
>
> Signed-off-by: Matan Barak <matanb@xxxxxxxxxxxx>
> ---
> drivers/infiniband/core/cm.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
> index 15d60f2..ea7f3c5 100644
> --- a/drivers/infiniband/core/cm.c
> +++ b/drivers/infiniband/core/cm.c
> @@ -361,17 +361,21 @@ static int cm_init_av_by_path(struct ib_sa_path_rec *path, struct cm_av *av)
> unsigned long flags;
> int ret;
> u8 p;
> + struct net_device *ndev = ib_get_ndev_from_path(path);
>
> read_lock_irqsave(&cm.device_lock, flags);
> list_for_each_entry(cm_dev, &cm.device_list, list) {
> if (!ib_find_cached_gid(cm_dev->ib_device, &path->sgid,
> - NULL, &p, NULL)) {
> + ndev, &p, NULL)) {
> port = cm_dev->port[p-1];
> break;
> }
> }
> read_unlock_irqrestore(&cm.device_lock, flags);
>
> + if (ndev)
> + dev_put(ndev);
> +
> if (!port)
> return -EINVAL;
>
> @@ -384,7 +388,6 @@ static int cm_init_av_by_path(struct ib_sa_path_rec *path, struct cm_av *av)
> ib_init_ah_from_path(cm_dev->ib_device, port->port_num, path,
> &av->ah_attr);
> av->timeout = path->packet_life_time + 1;
> - memcpy(av->smac, path->smac, sizeof(av->smac));
>
> av->valid = 1;
> return 0;
> --
> 2.1.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
