lkml.org 
[lkml]   [2022]   [Aug]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 047/136] net/mlx5e: Fix wrong tc flag used when set hw-tc-offload off
    Date
    From: Maor Dickman <maord@nvidia.com>

    [ Upstream commit 550f96432e6f6770efdaee0e65239d61431062a1 ]

    The cited commit reintroduced the ability to set hw-tc-offload
    in switchdev mode by reusing NIC mode calls without modifying it
    to support both modes, this can cause an illegal memory access
    when trying to turn hw-tc-offload off.

    Fix this by using the right TC_FLAG when checking if tc rules
    are installed while disabling hw-tc-offload.

    Fixes: d3cbd4254df8 ("net/mlx5e: Add ndo_set_feature for uplink representor")
    Signed-off-by: Maor Dickman <maord@nvidia.com>
    Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
    index fdf8d9866042c..c1c4f380803a1 100644
    --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
    +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
    @@ -3325,7 +3325,9 @@ static int set_feature_hw_tc(struct net_device *netdev, bool enable)
    struct mlx5e_priv *priv = netdev_priv(netdev);

    #if IS_ENABLED(CONFIG_MLX5_CLS_ACT)
    - if (!enable && mlx5e_tc_num_filters(priv, MLX5_TC_FLAG(NIC_OFFLOAD))) {
    + int tc_flag = mlx5e_is_uplink_rep(priv) ? MLX5_TC_FLAG(ESW_OFFLOAD) :
    + MLX5_TC_FLAG(NIC_OFFLOAD);
    + if (!enable && mlx5e_tc_num_filters(priv, tc_flag)) {
    netdev_err(netdev,
    "Active offloaded tc filters, can't turn hw_tc_offload off\n");
    return -EINVAL;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-29 13:09    [W:4.322 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site