net/ice/base: implement shared rate limiter
authorQi Zhang <qi.z.zhang@intel.com>
Tue, 20 Oct 2020 00:52:03 +0000 (08:52 +0800)
committerFerruh Yigit <ferruh.yigit@intel.com>
Tue, 3 Nov 2020 22:35:03 +0000 (23:35 +0100)
Implemented shared bandwidth rate limit functionality to account for
dedicated bandwidth and minimum bandwidth. It requires non default
profile be programmed for CIR, EIR/PIR, and SRL.

Signed-off-by: Tarun Singh <tarun.k.singh@intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Acked-by: Qiming Yang <qiming.yang@intel.com>
drivers/net/ice/base/ice_sched.c
drivers/net/ice/base/ice_sched.h

index 7867d4f..ac48bbe 100644 (file)
@@ -3132,12 +3132,6 @@ static void ice_set_clear_eir_bw(struct ice_bw_type_info *bw_t_info, u32 bw)
                ice_clear_bit(ICE_BW_TYPE_EIR, bw_t_info->bw_t_bitmap);
                bw_t_info->eir_bw.bw = 0;
        } else {
-               /* EIR BW and Shared BW profiles are mutually exclusive and
-                * hence only one of them may be set for any given element.
-                * First clear earlier saved shared BW information.
-                */
-               ice_clear_bit(ICE_BW_TYPE_SHARED, bw_t_info->bw_t_bitmap);
-               bw_t_info->shared_bw = 0;
                /* save EIR BW information */
                ice_set_bit(ICE_BW_TYPE_EIR, bw_t_info->bw_t_bitmap);
                bw_t_info->eir_bw.bw = bw;
@@ -3157,12 +3151,6 @@ static void ice_set_clear_shared_bw(struct ice_bw_type_info *bw_t_info, u32 bw)
                ice_clear_bit(ICE_BW_TYPE_SHARED, bw_t_info->bw_t_bitmap);
                bw_t_info->shared_bw = 0;
        } else {
-               /* EIR BW and Shared BW profiles are mutually exclusive and
-                * hence only one of them may be set for any given element.
-                * First clear earlier saved EIR BW information.
-                */
-               ice_clear_bit(ICE_BW_TYPE_EIR, bw_t_info->bw_t_bitmap);
-               bw_t_info->eir_bw.bw = 0;
                /* save shared BW information */
                ice_set_bit(ICE_BW_TYPE_SHARED, bw_t_info->bw_t_bitmap);
                bw_t_info->shared_bw = bw;
@@ -3435,15 +3423,19 @@ ice_cfg_agg_bw_dflt_lmt_per_tc(struct ice_port_info *pi, u32 agg_id, u8 tc,
  * ice_cfg_vsi_bw_shared_lmt - configure VSI BW shared limit
  * @pi: port information structure
  * @vsi_handle: software VSI handle
- * @bw: bandwidth in Kbps
+ * @min_bw: minimum bandwidth in Kbps
+ * @max_bw: maximum bandwidth in Kbps
+ * @shared_bw: shared bandwidth in Kbps
  *
- * This function Configures shared rate limiter(SRL) of all VSI type nodes
- * across all traffic classes for VSI matching handle.
+ * Configure shared rate limiter(SRL) of all VSI type nodes across all traffic
+ * classes for VSI matching handle.
  */
 enum ice_status
-ice_cfg_vsi_bw_shared_lmt(struct ice_port_info *pi, u16 vsi_handle, u32 bw)
+ice_cfg_vsi_bw_shared_lmt(struct ice_port_info *pi, u16 vsi_handle, u32 min_bw,
+                         u32 max_bw, u32 shared_bw)
 {
-       return ice_sched_set_vsi_bw_shared_lmt(pi, vsi_handle, bw);
+       return ice_sched_set_vsi_bw_shared_lmt(pi, vsi_handle, min_bw, max_bw,
+                                              shared_bw);
 }
 
 /**
@@ -3458,6 +3450,8 @@ enum ice_status
 ice_cfg_vsi_bw_no_shared_lmt(struct ice_port_info *pi, u16 vsi_handle)
 {
        return ice_sched_set_vsi_bw_shared_lmt(pi, vsi_handle,
+                                              ICE_SCHED_DFLT_BW,
+                                              ICE_SCHED_DFLT_BW,
                                               ICE_SCHED_DFLT_BW);
 }
 
@@ -3465,15 +3459,19 @@ ice_cfg_vsi_bw_no_shared_lmt(struct ice_port_info *pi, u16 vsi_handle)
  * ice_cfg_agg_bw_shared_lmt - configure aggregator BW shared limit
  * @pi: port information structure
  * @agg_id: aggregator ID
- * @bw: bandwidth in Kbps
+ * @min_bw: minimum bandwidth in Kbps
+ * @max_bw: maximum bandwidth in Kbps
+ * @shared_bw: shared bandwidth in Kbps
  *
  * This function configures the shared rate limiter(SRL) of all aggregator type
  * nodes across all traffic classes for aggregator matching agg_id.
  */
 enum ice_status
-ice_cfg_agg_bw_shared_lmt(struct ice_port_info *pi, u32 agg_id, u32 bw)
+ice_cfg_agg_bw_shared_lmt(struct ice_port_info *pi, u32 agg_id, u32 min_bw,
+                         u32 max_bw, u32 shared_bw)
 {
-       return ice_sched_set_agg_bw_shared_lmt(pi, agg_id, bw);
+       return ice_sched_set_agg_bw_shared_lmt(pi, agg_id, min_bw, max_bw,
+                                              shared_bw);
 }
 
 /**
@@ -3487,7 +3485,47 @@ ice_cfg_agg_bw_shared_lmt(struct ice_port_info *pi, u32 agg_id, u32 bw)
 enum ice_status
 ice_cfg_agg_bw_no_shared_lmt(struct ice_port_info *pi, u32 agg_id)
 {
-       return ice_sched_set_agg_bw_shared_lmt(pi, agg_id, ICE_SCHED_DFLT_BW);
+       return ice_sched_set_agg_bw_shared_lmt(pi, agg_id, ICE_SCHED_DFLT_BW,
+                                              ICE_SCHED_DFLT_BW,
+                                              ICE_SCHED_DFLT_BW);
+}
+
+/**
+ * ice_cfg_agg_bw_shared_lmt_per_tc - configure aggregator BW shared limit per tc
+ * @pi: port information structure
+ * @agg_id: aggregator ID
+ * @tc: traffic class
+ * @min_bw: minimum bandwidth in Kbps
+ * @max_bw: maximum bandwidth in Kbps
+ * @shared_bw: shared bandwidth in Kbps
+ *
+ * This function configures the shared rate limiter(SRL) of all aggregator type
+ * nodes across all traffic classes for aggregator matching agg_id.
+ */
+enum ice_status
+ice_cfg_agg_bw_shared_lmt_per_tc(struct ice_port_info *pi, u32 agg_id, u8 tc,
+                                u32 min_bw, u32 max_bw, u32 shared_bw)
+{
+       return ice_sched_set_agg_bw_shared_lmt_per_tc(pi, agg_id, tc, min_bw,
+                                                     max_bw, shared_bw);
+}
+
+/**
+ * ice_cfg_agg_bw_shared_lmt_per_tc - configure aggregator BW shared limit per tc
+ * @pi: port information structure
+ * @agg_id: aggregator ID
+ * @tc: traffic class
+ *
+ * This function configures the shared rate limiter(SRL) of all aggregator type
+ * nodes across all traffic classes for aggregator matching agg_id.
+ */
+enum ice_status
+ice_cfg_agg_bw_no_shared_lmt_per_tc(struct ice_port_info *pi, u32 agg_id, u8 tc)
+{
+       return ice_sched_set_agg_bw_shared_lmt_per_tc(pi, agg_id, tc,
+                                                     ICE_SCHED_DFLT_BW,
+                                                     ICE_SCHED_DFLT_BW,
+                                                     ICE_SCHED_DFLT_BW);
 }
 
 /**
@@ -3946,37 +3984,10 @@ ice_sched_cfg_node_bw_lmt(struct ice_hw *hw, struct ice_sched_node *node,
                data->cir_bw.bw_profile_idx = CPU_TO_LE16(rl_prof_id);
                break;
        case ICE_MAX_BW:
-               /* EIR BW and Shared BW profiles are mutually exclusive and
-                * hence only one of them may be set for any given element
-                */
-               if (data->valid_sections & ICE_AQC_ELEM_VALID_SHARED)
-                       return ICE_ERR_CFG;
                data->valid_sections |= ICE_AQC_ELEM_VALID_EIR;
                data->eir_bw.bw_profile_idx = CPU_TO_LE16(rl_prof_id);
                break;
        case ICE_SHARED_BW:
-               /* Check for removing shared BW */
-               if (rl_prof_id == ICE_SCHED_NO_SHARED_RL_PROF_ID) {
-                       /* remove shared profile */
-                       data->valid_sections &= ~ICE_AQC_ELEM_VALID_SHARED;
-                       data->srl_id = 0; /* clear SRL field */
-
-                       /* enable back EIR to default profile */
-                       data->valid_sections |= ICE_AQC_ELEM_VALID_EIR;
-                       data->eir_bw.bw_profile_idx =
-                               CPU_TO_LE16(ICE_SCHED_DFLT_RL_PROF_ID);
-                       break;
-               }
-               /* EIR BW and Shared BW profiles are mutually exclusive and
-                * hence only one of them may be set for any given element
-                */
-               if ((data->valid_sections & ICE_AQC_ELEM_VALID_EIR) &&
-                   (LE16_TO_CPU(data->eir_bw.bw_profile_idx) !=
-                           ICE_SCHED_DFLT_RL_PROF_ID))
-                       return ICE_ERR_CFG;
-               /* EIR BW is set to default, disable it */
-               data->valid_sections &= ~ICE_AQC_ELEM_VALID_EIR;
-               /* Okay to enable shared BW now */
                data->valid_sections |= ICE_AQC_ELEM_VALID_SHARED;
                data->srl_id = CPU_TO_LE16(rl_prof_id);
                break;
@@ -4187,51 +4198,6 @@ ice_sched_set_node_bw_dflt(struct ice_port_info *pi,
        return ice_sched_rm_rl_profile(hw, layer_num, profile_type, old_id);
 }
 
-/**
- * ice_sched_set_eir_srl_excl - set EIR/SRL exclusiveness
- * @pi: port information structure
- * @node: pointer to node structure
- * @layer_num: layer number where rate limit profiles are saved
- * @rl_type: rate limit type min, max, or shared
- * @bw: bandwidth value
- *
- * This function prepares node element's bandwidth to SRL or EIR exclusively.
- * EIR BW and Shared BW profiles are mutually exclusive and hence only one of
- * them may be set for any given element. This function needs to be called
- * with the scheduler lock held.
- */
-static enum ice_status
-ice_sched_set_eir_srl_excl(struct ice_port_info *pi,
-                          struct ice_sched_node *node,
-                          u8 layer_num, enum ice_rl_type rl_type, u32 bw)
-{
-       if (rl_type == ICE_SHARED_BW) {
-               /* SRL node passed in this case, it may be different node */
-               if (bw == ICE_SCHED_DFLT_BW)
-                       /* SRL being removed, ice_sched_cfg_node_bw_lmt()
-                        * enables EIR to default. EIR is not set in this
-                        * case, so no additional action is required.
-                        */
-                       return ICE_SUCCESS;
-
-               /* SRL being configured, set EIR to default here.
-                * ice_sched_cfg_node_bw_lmt() disables EIR when it
-                * configures SRL
-                */
-               return ice_sched_set_node_bw_dflt(pi, node, ICE_MAX_BW,
-                                                 layer_num);
-       } else if (rl_type == ICE_MAX_BW &&
-                  node->info.data.valid_sections & ICE_AQC_ELEM_VALID_SHARED) {
-               /* Remove Shared profile. Set default shared BW call
-                * removes shared profile for a node.
-                */
-               return ice_sched_set_node_bw_dflt(pi, node,
-                                                 ICE_SHARED_BW,
-                                                 layer_num);
-       }
-       return ICE_SUCCESS;
-}
-
 /**
  * ice_sched_set_node_bw - set node's bandwidth
  * @pi: port information structure
@@ -4289,14 +4255,14 @@ ice_sched_set_node_bw(struct ice_port_info *pi, struct ice_sched_node *node,
  *
  * It updates node's BW limit parameters like BW RL profile ID of type CIR,
  * EIR, or SRL. The caller needs to hold scheduler lock.
+ *
+ * NOTE: Caller provides the correct SRL node in case of shared profile
+ * settings.
  */
 static enum ice_status
 ice_sched_set_node_bw_lmt(struct ice_port_info *pi, struct ice_sched_node *node,
                          enum ice_rl_type rl_type, u32 bw)
 {
-       struct ice_sched_node *cfg_node = node;
-       enum ice_status status;
-
        struct ice_hw *hw;
        u8 layer_num;
 
@@ -4305,28 +4271,15 @@ ice_sched_set_node_bw_lmt(struct ice_port_info *pi, struct ice_sched_node *node,
        hw = pi->hw;
        /* Remove unused RL profile IDs from HW and SW DB */
        ice_sched_rm_unused_rl_prof(hw);
+
        layer_num = ice_sched_get_rl_prof_layer(pi, rl_type,
-                                               node->tx_sched_layer);
+               node->tx_sched_layer);
        if (layer_num >= hw->num_tx_sched_layers)
                return ICE_ERR_PARAM;
 
-       if (rl_type == ICE_SHARED_BW) {
-               /* SRL node may be different */
-               cfg_node = ice_sched_get_srl_node(node, layer_num);
-               if (!cfg_node)
-                       return ICE_ERR_CFG;
-       }
-       /* EIR BW and Shared BW profiles are mutually exclusive and
-        * hence only one of them may be set for any given element
-        */
-       status = ice_sched_set_eir_srl_excl(pi, cfg_node, layer_num, rl_type,
-                                           bw);
-       if (status)
-               return status;
        if (bw == ICE_SCHED_DFLT_BW)
-               return ice_sched_set_node_bw_dflt(pi, cfg_node, rl_type,
-                                                 layer_num);
-       return ice_sched_set_node_bw(pi, cfg_node, rl_type, bw, layer_num);
+               return ice_sched_set_node_bw_dflt(pi, node, rl_type, layer_num);
+       return ice_sched_set_node_bw(pi, node, rl_type, bw, layer_num);
 }
 
 /**
@@ -4886,19 +4839,108 @@ ice_sched_validate_vsi_srl_node(struct ice_port_info *pi, u16 vsi_handle)
        return ICE_SUCCESS;
 }
 
+/**
+ * ice_sched_set_save_vsi_srl_node_bw - set VSI shared limit values
+ * @pi: port information structure
+ * @vsi_handle: software VSI handle
+ * @tc: traffic class
+ * @srl_node: sched node to configure
+ * @rl_type: rate limit type minimum, maximum, or shared
+ * @bw: minimum, maximum, or shared bandwidth in Kbps
+ *
+ * Configure shared rate limiter(SRL) of VSI type nodes across given traffic
+ * class, and saves those value for later use for replaying purposes. The
+ * caller holds the scheduler lock.
+ */
+static enum ice_status
+ice_sched_set_save_vsi_srl_node_bw(struct ice_port_info *pi, u16 vsi_handle,
+                                  u8 tc, struct ice_sched_node *srl_node,
+                                  enum ice_rl_type rl_type, u32 bw)
+{
+       enum ice_status status;
+
+       if (bw == ICE_SCHED_DFLT_BW) {
+               status = ice_sched_set_node_bw_dflt_lmt(pi, srl_node, rl_type);
+       } else {
+               status = ice_sched_set_node_bw_lmt(pi, srl_node, rl_type, bw);
+               if (status)
+                       return status;
+               status = ice_sched_save_vsi_bw(pi, vsi_handle, tc, rl_type, bw);
+       }
+       return status;
+}
+
+/**
+ * ice_sched_set_vsi_node_srl_per_tc - set VSI node BW shared limit for tc
+ * @pi: port information structure
+ * @vsi_handle: software VSI handle
+ * @tc: traffic class
+ * @min_bw: minimum bandwidth in Kbps
+ * @max_bw: maximum bandwidth in Kbps
+ * @shared_bw: shared bandwidth in Kbps
+ *
+ * Configure shared rate limiter(SRL) of  VSI type nodes across requested
+ * traffic class for VSI matching handle. When BW value of ICE_SCHED_DFLT_BW
+ * is passed, it removes the corresponding bw from the node. The caller
+ * holds scheduler lock.
+ */
+static enum ice_status
+ice_sched_set_vsi_node_srl_per_tc(struct ice_port_info *pi, u16 vsi_handle,
+                                 u8 tc, u32 min_bw, u32 max_bw, u32 shared_bw)
+{
+       struct ice_sched_node *tc_node, *vsi_node, *cfg_node;
+       enum ice_status status;
+       u8 layer_num;
+
+       tc_node = ice_sched_get_tc_node(pi, tc);
+       if (!tc_node)
+               return ICE_ERR_CFG;
+
+       vsi_node = ice_sched_get_vsi_node(pi, tc_node, vsi_handle);
+       if (!vsi_node)
+               return ICE_ERR_CFG;
+
+       layer_num = ice_sched_get_rl_prof_layer(pi, ICE_SHARED_BW,
+                                               vsi_node->tx_sched_layer);
+       if (layer_num >= pi->hw->num_tx_sched_layers)
+               return ICE_ERR_PARAM;
+
+       /* SRL node may be different */
+       cfg_node = ice_sched_get_srl_node(vsi_node, layer_num);
+       if (!cfg_node)
+               return ICE_ERR_CFG;
+
+       status = ice_sched_set_save_vsi_srl_node_bw(pi, vsi_handle, tc,
+                                                   cfg_node, ICE_MIN_BW,
+                                                   min_bw);
+       if (status)
+               return status;
+
+       status = ice_sched_set_save_vsi_srl_node_bw(pi, vsi_handle, tc,
+                                                   cfg_node, ICE_MAX_BW,
+                                                   max_bw);
+       if (status)
+               return status;
+
+       return ice_sched_set_save_vsi_srl_node_bw(pi, vsi_handle, tc, cfg_node,
+                                                 ICE_SHARED_BW, shared_bw);
+}
+
 /**
  * ice_sched_set_vsi_bw_shared_lmt - set VSI BW shared limit
  * @pi: port information structure
  * @vsi_handle: software VSI handle
- * @bw: bandwidth in Kbps
+ * @min_bw: minimum bandwidth in Kbps
+ * @max_bw: maximum bandwidth in Kbps
+ * @shared_bw: shared bandwidth in Kbps
  *
- * This function Configures shared rate limiter(SRL) of all VSI type nodes
- * across all traffic classes for VSI matching handle. When BW value of
- * ICE_SCHED_DFLT_BW is passed, it removes the SRL from the node.
+ * Configure shared rate limiter(SRL) of all VSI type nodes across all traffic
+ * classes for VSI matching handle. When BW value of ICE_SCHED_DFLT_BW is
+ * passed, it removes those value(s) from the node.
  */
 enum ice_status
 ice_sched_set_vsi_bw_shared_lmt(struct ice_port_info *pi, u16 vsi_handle,
-                               u32 bw)
+                               u32 min_bw, u32 max_bw, u32 shared_bw)
 {
        enum ice_status status = ICE_SUCCESS;
        u8 tc;
@@ -4916,7 +4958,6 @@ ice_sched_set_vsi_bw_shared_lmt(struct ice_port_info *pi, u16 vsi_handle,
        /* Return success if no nodes are present across TC */
        ice_for_each_traffic_class(tc) {
                struct ice_sched_node *tc_node, *vsi_node;
-               enum ice_rl_type rl_type = ICE_SHARED_BW;
 
                tc_node = ice_sched_get_tc_node(pi, tc);
                if (!tc_node)
@@ -4926,16 +4967,9 @@ ice_sched_set_vsi_bw_shared_lmt(struct ice_port_info *pi, u16 vsi_handle,
                if (!vsi_node)
                        continue;
 
-               if (bw == ICE_SCHED_DFLT_BW)
-                       /* It removes existing SRL from the node */
-                       status = ice_sched_set_node_bw_dflt_lmt(pi, vsi_node,
-                                                               rl_type);
-               else
-                       status = ice_sched_set_node_bw_lmt(pi, vsi_node,
-                                                          rl_type, bw);
-               if (status)
-                       break;
-               status = ice_sched_save_vsi_bw(pi, vsi_handle, tc, rl_type, bw);
+               status = ice_sched_set_vsi_node_srl_per_tc(pi, vsi_handle, tc,
+                                                          min_bw, max_bw,
+                                                          shared_bw);
                if (status)
                        break;
        }
@@ -5003,32 +5037,23 @@ ice_sched_validate_agg_srl_node(struct ice_port_info *pi, u32 agg_id)
 }
 
 /**
- * ice_sched_set_agg_bw_shared_lmt - set aggregator BW shared limit
+ * ice_sched_validate_agg_id - Validate aggregator id
  * @pi: port information structure
  * @agg_id: aggregator ID
- * @bw: bandwidth in Kbps
  *
- * This function configures the shared rate limiter(SRL) of all aggregator type
- * nodes across all traffic classes for aggregator matching agg_id. When
- * BW value of ICE_SCHED_DFLT_BW is passed, it removes SRL from the
- * node(s).
+ * This function validates aggregator id. Caller holds the scheduler lock.
  */
-enum ice_status
-ice_sched_set_agg_bw_shared_lmt(struct ice_port_info *pi, u32 agg_id, u32 bw)
+static enum ice_status
+ice_sched_validate_agg_id(struct ice_port_info *pi, u32 agg_id)
 {
        struct ice_sched_agg_info *agg_info;
        struct ice_sched_agg_info *tmp;
        bool agg_id_present = false;
-       enum ice_status status = ICE_SUCCESS;
-       u8 tc;
-
-       if (!pi)
-               return ICE_ERR_PARAM;
+       enum ice_status status;
 
-       ice_acquire_lock(&pi->sched_lock);
        status = ice_sched_validate_agg_srl_node(pi, agg_id);
        if (status)
-               goto exit_agg_bw_shared_lmt;
+               return status;
 
        LIST_FOR_EACH_ENTRY_SAFE(agg_info, tmp, &pi->hw->agg_list,
                                 ice_sched_agg_info, list_entry)
@@ -5037,14 +5062,129 @@ ice_sched_set_agg_bw_shared_lmt(struct ice_port_info *pi, u32 agg_id, u32 bw)
                        break;
                }
 
-       if (!agg_id_present) {
-               status = ICE_ERR_PARAM;
-               goto exit_agg_bw_shared_lmt;
+       if (!agg_id_present)
+               return ICE_ERR_PARAM;
+
+       return ICE_SUCCESS;
+}
+
+/**
+ * ice_sched_set_save_agg_srl_node_bw - set aggregator shared limit values
+ * @pi: port information structure
+ * @agg_id: aggregator ID
+ * @tc: traffic class
+ * @srl_node: sched node to configure
+ * @rl_type: rate limit type minimum, maximum, or shared
+ * @bw: minimum, maximum, or shared bandwidth in Kbps
+ *
+ * Configure shared rate limiter(SRL) of aggregator type nodes across
+ * requested traffic class, and saves those value for later use for
+ * replaying purposes. The caller holds the scheduler lock.
+ */
+static enum ice_status
+ice_sched_set_save_agg_srl_node_bw(struct ice_port_info *pi, u32 agg_id, u8 tc,
+                                  struct ice_sched_node *srl_node,
+                                  enum ice_rl_type rl_type, u32 bw)
+{
+       enum ice_status status;
+
+       if (bw == ICE_SCHED_DFLT_BW) {
+               status = ice_sched_set_node_bw_dflt_lmt(pi, srl_node, rl_type);
+       } else {
+               status = ice_sched_set_node_bw_lmt(pi, srl_node, rl_type, bw);
+               if (status)
+                       return status;
+               status = ice_sched_save_agg_bw(pi, agg_id, tc, rl_type, bw);
        }
+       return status;
+}
+
+/**
+ * ice_sched_set_agg_node_srl_per_tc - set aggregator SRL per tc
+ * @pi: port information structure
+ * @agg_id: aggregator ID
+ * @tc: traffic class
+ * @min_bw: minimum bandwidth in Kbps
+ * @max_bw: maximum bandwidth in Kbps
+ * @shared_bw: shared bandwidth in Kbps
+ *
+ * This function configures the shared rate limiter(SRL) of aggregator type
+ * node for a given traffic class for aggregator matching agg_id. When BW
+ * value of ICE_SCHED_DFLT_BW is passed, it removes SRL from the node. Caller
+ * holds the scheduler lock.
+ */
+static enum ice_status
+ice_sched_set_agg_node_srl_per_tc(struct ice_port_info *pi, u32 agg_id,
+                                 u8 tc, u32 min_bw, u32 max_bw, u32 shared_bw)
+{
+       struct ice_sched_node *tc_node, *agg_node, *cfg_node;
+       enum ice_rl_type rl_type = ICE_SHARED_BW;
+       enum ice_status status = ICE_ERR_CFG;
+       u8 layer_num;
+
+       tc_node = ice_sched_get_tc_node(pi, tc);
+       if (!tc_node)
+               return ICE_ERR_CFG;
+
+       agg_node = ice_sched_get_agg_node(pi, tc_node, agg_id);
+       if (!agg_node)
+               return ICE_ERR_CFG;
+
+       layer_num = ice_sched_get_rl_prof_layer(pi, rl_type,
+                                               agg_node->tx_sched_layer);
+       if (layer_num >= pi->hw->num_tx_sched_layers)
+               return ICE_ERR_PARAM;
+
+       /* SRL node may be different */
+       cfg_node = ice_sched_get_srl_node(agg_node, layer_num);
+       if (!cfg_node)
+               return ICE_ERR_CFG;
+
+       status = ice_sched_set_save_agg_srl_node_bw(pi, agg_id, tc, cfg_node,
+                                                   ICE_MIN_BW, min_bw);
+       if (status)
+               return status;
+
+       status = ice_sched_set_save_agg_srl_node_bw(pi, agg_id, tc, cfg_node,
+                                                   ICE_MAX_BW, max_bw);
+       if (status)
+               return status;
+
+       status = ice_sched_set_save_agg_srl_node_bw(pi, agg_id, tc, cfg_node,
+                                                   ICE_SHARED_BW, shared_bw);
+       return status;
+}
+
+/**
+ * ice_sched_set_agg_bw_shared_lmt - set aggregator BW shared limit
+ * @pi: port information structure
+ * @agg_id: aggregator ID
+ * @min_bw: minimum bandwidth in Kbps
+ * @max_bw: maximum bandwidth in Kbps
+ * @shared_bw: shared bandwidth in Kbps
+ *
+ * This function configures the shared rate limiter(SRL) of all aggregator type
+ * nodes across all traffic classes for aggregator matching agg_id. When
+ * BW value of ICE_SCHED_DFLT_BW is passed, it removes SRL from the
+ * node(s).
+ */
+enum ice_status
+ice_sched_set_agg_bw_shared_lmt(struct ice_port_info *pi, u32 agg_id,
+                               u32 min_bw, u32 max_bw, u32 shared_bw)
+{
+       enum ice_status status;
+       u8 tc;
+
+       if (!pi)
+               return ICE_ERR_PARAM;
+
+       ice_acquire_lock(&pi->sched_lock);
+       status = ice_sched_validate_agg_id(pi, agg_id);
+       if (status)
+               goto exit_agg_bw_shared_lmt;
 
        /* Return success if no nodes are present across TC */
        ice_for_each_traffic_class(tc) {
-               enum ice_rl_type rl_type = ICE_SHARED_BW;
                struct ice_sched_node *tc_node, *agg_node;
 
                tc_node = ice_sched_get_tc_node(pi, tc);
@@ -5055,16 +5195,9 @@ ice_sched_set_agg_bw_shared_lmt(struct ice_port_info *pi, u32 agg_id, u32 bw)
                if (!agg_node)
                        continue;
 
-               if (bw == ICE_SCHED_DFLT_BW)
-                       /* It removes existing SRL from the node */
-                       status = ice_sched_set_node_bw_dflt_lmt(pi, agg_node,
-                                                               rl_type);
-               else
-                       status = ice_sched_set_node_bw_lmt(pi, agg_node,
-                                                          rl_type, bw);
-               if (status)
-                       break;
-               status = ice_sched_save_agg_bw(pi, agg_id, tc, rl_type, bw);
+               status = ice_sched_set_agg_node_srl_per_tc(pi, agg_id, tc,
+                                                          min_bw, max_bw,
+                                                          shared_bw);
                if (status)
                        break;
        }
@@ -5074,6 +5207,41 @@ exit_agg_bw_shared_lmt:
        return status;
 }
 
+/**
+ * ice_sched_set_agg_bw_shared_lmt_per_tc - set aggregator BW shared lmt per tc
+ * @pi: port information structure
+ * @agg_id: aggregator ID
+ * @tc: traffic class
+ * @min_bw: minimum bandwidth in Kbps
+ * @max_bw: maximum bandwidth in Kbps
+ * @shared_bw: shared bandwidth in Kbps
+ *
+ * This function configures the shared rate limiter(SRL) of aggregator type
+ * node for a given traffic class for aggregator matching agg_id. When BW
+ * value of ICE_SCHED_DFLT_BW is passed, it removes SRL from the node.
+ */
+enum ice_status
+ice_sched_set_agg_bw_shared_lmt_per_tc(struct ice_port_info *pi, u32 agg_id,
+                                      u8 tc, u32 min_bw, u32 max_bw,
+                                      u32 shared_bw)
+{
+       enum ice_status status;
+
+       if (!pi)
+               return ICE_ERR_PARAM;
+       ice_acquire_lock(&pi->sched_lock);
+       status = ice_sched_validate_agg_id(pi, agg_id);
+       if (status)
+               goto exit_agg_bw_shared_lmt_per_tc;
+
+       status = ice_sched_set_agg_node_srl_per_tc(pi, agg_id, tc, min_bw,
+                                                  max_bw, shared_bw);
+
+exit_agg_bw_shared_lmt_per_tc:
+       ice_release_lock(&pi->sched_lock);
+       return status;
+}
+
 /**
  * ice_sched_cfg_sibl_node_prio - configure node sibling priority
  * @pi: port information structure
index 501a4c4..8b27563 100644 (file)
@@ -153,14 +153,22 @@ enum ice_status
 ice_cfg_agg_bw_dflt_lmt_per_tc(struct ice_port_info *pi, u32 agg_id, u8 tc,
                               enum ice_rl_type rl_type);
 enum ice_status
-ice_cfg_vsi_bw_shared_lmt(struct ice_port_info *pi, u16 vsi_handle, u32 bw);
+ice_cfg_vsi_bw_shared_lmt(struct ice_port_info *pi, u16 vsi_handle, u32 min_bw,
+                         u32 max_bw, u32 shared_bw);
 enum ice_status
 ice_cfg_vsi_bw_no_shared_lmt(struct ice_port_info *pi, u16 vsi_handle);
 enum ice_status
-ice_cfg_agg_bw_shared_lmt(struct ice_port_info *pi, u32 agg_id, u32 bw);
+ice_cfg_agg_bw_shared_lmt(struct ice_port_info *pi, u32 agg_id, u32 min_bw,
+                         u32 max_bw, u32 shared_bw);
 enum ice_status
 ice_cfg_agg_bw_no_shared_lmt(struct ice_port_info *pi, u32 agg_id);
 enum ice_status
+ice_cfg_agg_bw_shared_lmt_per_tc(struct ice_port_info *pi, u32 agg_id, u8 tc,
+                                u32 min_bw, u32 max_bw, u32 shared_bw);
+enum ice_status
+ice_cfg_agg_bw_no_shared_lmt_per_tc(struct ice_port_info *pi, u32 agg_id,
+                                   u8 tc);
+enum ice_status
 ice_cfg_vsi_q_priority(struct ice_port_info *pi, u16 num_qs, u32 *q_ids,
                       u8 *q_prio);
 enum ice_status
@@ -184,9 +192,14 @@ ice_sched_set_node_bw_lmt_per_tc(struct ice_port_info *pi, u32 id,
                                 enum ice_rl_type rl_type, u32 bw);
 enum ice_status
 ice_sched_set_vsi_bw_shared_lmt(struct ice_port_info *pi, u16 vsi_handle,
-                               u32 bw);
+                               u32 min_bw, u32 max_bw, u32 shared_bw);
+enum ice_status
+ice_sched_set_agg_bw_shared_lmt(struct ice_port_info *pi, u32 agg_id, u32 min_bw,
+                               u32 max_bw, u32 shared_bw);
 enum ice_status
-ice_sched_set_agg_bw_shared_lmt(struct ice_port_info *pi, u32 agg_id, u32 bw);
+ice_sched_set_agg_bw_shared_lmt_per_tc(struct ice_port_info *pi, u32 agg_id,
+                                      u8 tc, u32 min_bw, u32 max_bw,
+                                      u32 shared_bw);
 enum ice_status
 ice_sched_cfg_sibl_node_prio(struct ice_port_info *pi,
                             struct ice_sched_node *node, u8 priority);