lkml.org 
[lkml]   [2019]   [Jul]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 117/129] net/mlx4_core: Fix locking in SRIOV mode when switching between events and polling
    3.16.70-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Jack Morgenstein <jackm@dev.mellanox.co.il>

    commit c07d27927f2f2e96fcd27bb9fb330c9ea65612d0 upstream.

    In procedures mlx4_cmd_use_events() and mlx4_cmd_use_polling(), we need to
    guarantee that there are no FW commands in progress on the comm channel
    (for VFs) or wrapped FW commands (on the PF) when SRIOV is active.

    We do this by also taking the slave_cmd_mutex when SRIOV is active.

    This is especially important when switching from event to polling, since we
    free the command-context array during the switch. If there are FW commands
    in progress (e.g., waiting for a completion event), the completion event
    handler will access freed memory.

    Since the decision to use comm_wait or comm_poll is taken before grabbing
    the event_sem/poll_sem in mlx4_comm_cmd_wait/poll, we must take the
    slave_cmd_mutex as well (to guarantee that the decision to use events or
    polling and the call to the appropriate cmd function are atomic).

    Fixes: a7e1f04905e5 ("net/mlx4_core: Fix deadlock when switching between polling and event fw commands")
    Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
    Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/net/ethernet/mellanox/mlx4/cmd.c | 8 ++++++++
    1 file changed, 8 insertions(+)

    --- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
    +++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
    @@ -2196,6 +2196,8 @@ int mlx4_cmd_use_events(struct mlx4_dev
    if (!priv->cmd.context)
    return -ENOMEM;

    + if (mlx4_is_mfunc(dev))
    + mutex_lock(&priv->cmd.slave_cmd_mutex);
    down_write(&priv->cmd.switch_sem);
    for (i = 0; i < priv->cmd.max_cmds; ++i) {
    priv->cmd.context[i].token = i;
    @@ -2217,6 +2219,8 @@ int mlx4_cmd_use_events(struct mlx4_dev
    down(&priv->cmd.poll_sem);
    priv->cmd.use_events = 1;
    up_write(&priv->cmd.switch_sem);
    + if (mlx4_is_mfunc(dev))
    + mutex_unlock(&priv->cmd.slave_cmd_mutex);

    return err;
    }
    @@ -2229,6 +2233,8 @@ void mlx4_cmd_use_polling(struct mlx4_de
    struct mlx4_priv *priv = mlx4_priv(dev);
    int i;

    + if (mlx4_is_mfunc(dev))
    + mutex_lock(&priv->cmd.slave_cmd_mutex);
    down_write(&priv->cmd.switch_sem);
    priv->cmd.use_events = 0;

    @@ -2239,6 +2245,8 @@ void mlx4_cmd_use_polling(struct mlx4_de

    up(&priv->cmd.poll_sem);
    up_write(&priv->cmd.switch_sem);
    + if (mlx4_is_mfunc(dev))
    + mutex_unlock(&priv->cmd.slave_cmd_mutex);
    }

    struct mlx4_cmd_mailbox *mlx4_alloc_cmd_mailbox(struct mlx4_dev *dev)
    \
     
     \ /
      Last update: 2019-07-07 21:41    [W:4.019 / U:0.400 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site