lkml.org 
[lkml]   [2018]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 3.18 070/102] net/mlx4: Fix the check in attaching steering rules
    Date
    From: Talat Batheesh <talatb@mellanox.com>

    [ Upstream commit 6dc06c08bef1c746ff8da33dab677cfbacdcad32 ]

    Our previous patch (cited below) introduced a regression
    for RAW Eth QPs.

    Fix it by checking if the QP number provided by user-space
    exists, hence allowing steering rules to be added for valid
    QPs only.

    Fixes: 89c557687a32 ("net/mlx4_en: Avoid adding steering rules with invalid ring")
    Reported-by: Or Gerlitz <gerlitz.or@gmail.com>
    Signed-off-by: Talat Batheesh <talatb@mellanox.com>
    Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
    Acked-by: Or Gerlitz <ogerlitz@mellanox.com>
    Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 5 -----
    drivers/net/ethernet/mellanox/mlx4/mcg.c | 15 +++++++++++----
    drivers/net/ethernet/mellanox/mlx4/qp.c | 13 +++++++++++++
    include/linux/mlx4/qp.h | 1 +
    4 files changed, 25 insertions(+), 9 deletions(-)

    diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
    index 17b3950e04a7..ae83da9cd18a 100644
    --- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
    +++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
    @@ -946,11 +946,6 @@ static int mlx4_en_flow_replace(struct net_device *dev,
    qpn = priv->drop_qp.qpn;
    else if (cmd->fs.ring_cookie & EN_ETHTOOL_QP_ATTACH) {
    qpn = cmd->fs.ring_cookie & (EN_ETHTOOL_QP_ATTACH - 1);
    - if (qpn < priv->rss_map.base_qpn ||
    - qpn >= priv->rss_map.base_qpn + priv->rx_ring_num) {
    - en_warn(priv, "rxnfc: QP (0x%x) doesn't exist\n", qpn);
    - return -EINVAL;
    - }
    } else {
    if (cmd->fs.ring_cookie >= priv->rx_ring_num) {
    en_warn(priv, "rxnfc: RX ring (%llu) doesn't exist\n",
    diff --git a/drivers/net/ethernet/mellanox/mlx4/mcg.c b/drivers/net/ethernet/mellanox/mlx4/mcg.c
    index 872843179f44..c704e7bcda9d 100644
    --- a/drivers/net/ethernet/mellanox/mlx4/mcg.c
    +++ b/drivers/net/ethernet/mellanox/mlx4/mcg.c
    @@ -35,6 +35,7 @@
    #include <linux/etherdevice.h>

    #include <linux/mlx4/cmd.h>
    +#include <linux/mlx4/qp.h>
    #include <linux/export.h>

    #include "mlx4.h"
    @@ -985,16 +986,21 @@ int mlx4_flow_attach(struct mlx4_dev *dev,
    if (IS_ERR(mailbox))
    return PTR_ERR(mailbox);

    + if (!mlx4_qp_lookup(dev, rule->qpn)) {
    + mlx4_err_rule(dev, "QP doesn't exist\n", rule);
    + ret = -EINVAL;
    + goto out;
    + }
    +
    trans_rule_ctrl_to_hw(rule, mailbox->buf);

    size += sizeof(struct mlx4_net_trans_rule_hw_ctrl);

    list_for_each_entry(cur, &rule->list, list) {
    ret = parse_trans_rule(dev, cur, mailbox->buf + size);
    - if (ret < 0) {
    - mlx4_free_cmd_mailbox(dev, mailbox);
    - return ret;
    - }
    + if (ret < 0)
    + goto out;
    +
    size += ret;
    }

    @@ -1006,6 +1012,7 @@ int mlx4_flow_attach(struct mlx4_dev *dev,
    else if (ret)
    mlx4_err_rule(dev, "Fail to register network rule\n", rule);

    +out:
    mlx4_free_cmd_mailbox(dev, mailbox);

    return ret;
    diff --git a/drivers/net/ethernet/mellanox/mlx4/qp.c b/drivers/net/ethernet/mellanox/mlx4/qp.c
    index b295eeb2af69..87e00742d401 100644
    --- a/drivers/net/ethernet/mellanox/mlx4/qp.c
    +++ b/drivers/net/ethernet/mellanox/mlx4/qp.c
    @@ -358,6 +358,19 @@ static void mlx4_qp_free_icm(struct mlx4_dev *dev, int qpn)
    __mlx4_qp_free_icm(dev, qpn);
    }

    +struct mlx4_qp *mlx4_qp_lookup(struct mlx4_dev *dev, u32 qpn)
    +{
    + struct mlx4_qp_table *qp_table = &mlx4_priv(dev)->qp_table;
    + struct mlx4_qp *qp;
    +
    + spin_lock(&qp_table->lock);
    +
    + qp = __mlx4_qp_lookup(dev, qpn);
    +
    + spin_unlock(&qp_table->lock);
    + return qp;
    +}
    +
    int mlx4_qp_alloc(struct mlx4_dev *dev, int qpn, struct mlx4_qp *qp, gfp_t gfp)
    {
    struct mlx4_priv *priv = mlx4_priv(dev);
    diff --git a/include/linux/mlx4/qp.h b/include/linux/mlx4/qp.h
    index 5f4e36cf0091..30a73892a8d6 100644
    --- a/include/linux/mlx4/qp.h
    +++ b/include/linux/mlx4/qp.h
    @@ -437,6 +437,7 @@ struct mlx4_update_qp_params {
    u32 flags;
    };

    +struct mlx4_qp *mlx4_qp_lookup(struct mlx4_dev *dev, u32 qpn);
    int mlx4_update_qp(struct mlx4_dev *dev, u32 qpn,
    enum mlx4_update_qp_attr attr,
    struct mlx4_update_qp_params *params);
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-19 17:15    [W:4.260 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site