net/ice/base: fix unexpected switch rule overwrite

A switch rule with "drop" action will be overwritten by a
rule with same pattern match but with a "to queue" action.
While in an inversed flow creation sequence, the "to queue"
can't be overwritten by the "drop" rule.

The inconsistent behavior is not expected, the patch
fix the issue by preventing rule overwrite in both cases.

Fixes: fed0c5ca5f19 ("net/ice/base: support programming a new switch recipe")
Cc: stable@dpdk.org
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>
Acked-by: Qiming Yang <qiming.yang@intel.com>

diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c
index 334f1b5e06b74b3dd0444b4fa97556cee5a04577..2c02021b1974753125c25263ab08be670295002a 100644 (file)
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -5977,13 +5977,10 @@ ice_adv_add_update_vsi_list(struct ice_hw *hw,
        u16 vsi_list_id = 0;
 
        if (cur_fltr->sw_act.fltr_act == ICE_FWD_TO_Q ||
-           cur_fltr->sw_act.fltr_act == ICE_FWD_TO_QGRP)
+           cur_fltr->sw_act.fltr_act == ICE_FWD_TO_QGRP ||
+           cur_fltr->sw_act.fltr_act == ICE_DROP_PACKET)
                return ICE_ERR_NOT_IMPL;
 
-       if (cur_fltr->sw_act.fltr_act == ICE_DROP_PACKET &&
-           new_fltr->sw_act.fltr_act == ICE_DROP_PACKET)
-               return ICE_ERR_ALREADY_EXISTS;
-
        if ((new_fltr->sw_act.fltr_act == ICE_FWD_TO_Q ||
             new_fltr->sw_act.fltr_act == ICE_FWD_TO_QGRP) &&
            (cur_fltr->sw_act.fltr_act == ICE_FWD_TO_VSI ||