lkml.org 
[lkml]   [2017]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 102/148] bnx2x: do not rollback VF MAC/VLAN filters we did not configure
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Michal Schmidt <mschmidt@redhat.com>


    [ Upstream commit 78d5505432436516456c12abbe705ec8dee7ee2b ]

    On failure to configure a VF MAC/VLAN filter we should not attempt to
    rollback filters that we failed to configure with -EEXIST.

    Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 8 +++++++-
    drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 1 +
    2 files changed, 8 insertions(+), 1 deletion(-)

    --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
    +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
    @@ -434,7 +434,9 @@ static int bnx2x_vf_mac_vlan_config(stru

    /* Add/Remove the filter */
    rc = bnx2x_config_vlan_mac(bp, &ramrod);
    - if (rc && rc != -EEXIST) {
    + if (rc == -EEXIST)
    + return 0;
    + if (rc) {
    BNX2X_ERR("Failed to %s %s\n",
    filter->add ? "add" : "delete",
    (filter->type == BNX2X_VF_FILTER_VLAN_MAC) ?
    @@ -444,6 +446,8 @@ static int bnx2x_vf_mac_vlan_config(stru
    return rc;
    }

    + filter->applied = true;
    +
    return 0;
    }

    @@ -471,6 +475,8 @@ int bnx2x_vf_mac_vlan_config_list(struct
    BNX2X_ERR("Managed only %d/%d filters - rolling back\n",
    i, filters->count + 1);
    while (--i >= 0) {
    + if (!filters->filters[i].applied)
    + continue;
    filters->filters[i].add = !filters->filters[i].add;
    bnx2x_vf_mac_vlan_config(bp, vf, qid,
    &filters->filters[i],
    --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h
    +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h
    @@ -114,6 +114,7 @@ struct bnx2x_vf_mac_vlan_filter {
    (BNX2X_VF_FILTER_MAC | BNX2X_VF_FILTER_VLAN) /*shortcut*/

    bool add;
    + bool applied;
    u8 *mac;
    u16 vid;
    };

    \
     
     \ /
      Last update: 2017-12-12 14:14    [W:4.165 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site