[Intel-wired-lan,iwl-next,v1] ice: refactor ice_fdir_create_dflt_rules() function

Commit Message

Mateusz Polchlopek Jan. 17, 2025, 8:06 a.m. UTC

The Flow Director function ice_fdir_create_dflt_rules() calls few
times function ice_create_init_fdir_rule() each time with different
enum ice_fltr_ptype parameter. Next step is to return error code if
error occurred.

Change the code to store all necessary default rules in constant array
and call ice_create_init_fdir_rule() in the loop. It makes it easy to
extend the list of default rules in the future, without the need of
duplicate code more and more.

Reviewed-by: Michal Swiatkowski <[e-mail]>
Signed-off-by: Mateusz Polchlopek <[e-mail]>
---
 .../net/ethernet/intel/ice/ice_ethtool_fdir.c | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

Comments

Simon Horman Jan. 20, 2025, 11:06 a.m. UTC | #1

On Fri, Jan 17, 2025 at 09:06:32AM +0100, Mateusz Polchlopek wrote:
> The Flow Director function ice_fdir_create_dflt_rules() calls few
> times function ice_create_init_fdir_rule() each time with different
> enum ice_fltr_ptype parameter. Next step is to return error code if
> error occurred.
> 
> Change the code to store all necessary default rules in constant array
> and call ice_create_init_fdir_rule() in the loop. It makes it easy to
> extend the list of default rules in the future, without the need of
> duplicate code more and more.
> 
> Reviewed-by: Michal Swiatkowski <[e-mail]>
> Signed-off-by: Mateusz Polchlopek <[e-mail]>

Reviewed-by: Simon Horman <[e-mail]>

Rinitha, SX Feb. 3, 2025, 3:49 a.m. UTC | #2

> -----Original Message-----
> From: Intel-wired-lan <[e-mail]> On Behalf Of Mateusz Polchlopek
> Sent: 17 January 2025 13:37
> To: [e-mail]
> Cc: [e-mail]; Polchlopek, Mateusz <[e-mail]>; Michal Swiatkowski <[e-mail]>
> Subject: [Intel-wired-lan] [PATCH iwl-next v1] ice: refactor ice_fdir_create_dflt_rules() function
>
> The Flow Director function ice_fdir_create_dflt_rules() calls few times function ice_create_init_fdir_rule() each time with different enum ice_fltr_ptype parameter. Next step is to return error code if error occurred.
>
> Change the code to store all necessary default rules in constant array and call ice_create_init_fdir_rule() in the loop. It makes it easy to extend the list of default rules in the future, without the need of duplicate code more and more.
>
> Reviewed-by: Michal Swiatkowski <[e-mail]>
> Signed-off-by: Mateusz Polchlopek <[e-mail]>
> ---
> .../net/ethernet/intel/ice/ice_ethtool_fdir.c | 21 ++++++++-----------
> 1 file changed, 9 insertions(+), 12 deletions(-)
>

Tested-by: Rinitha S <[e-mail]> (A Contingent worker at Intel)

Patch

diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c b/drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c
index ee9862ddfe15..1d118171de37 100644
--- a/drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c
+++ b/drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c
@@ -1605,22 +1605,19 @@  void ice_fdir_replay_fltrs(struct ice_pf *pf)
  */
 int ice_fdir_create_dflt_rules(struct ice_pf *pf)
 {
+	const enum ice_fltr_ptype dflt_rules[] = {
+		ICE_FLTR_PTYPE_NONF_IPV4_TCP, ICE_FLTR_PTYPE_NONF_IPV4_UDP,
+		ICE_FLTR_PTYPE_NONF_IPV6_TCP, ICE_FLTR_PTYPE_NONF_IPV6_UDP,
+	};
 	int err;
 
 	/* Create perfect TCP and UDP rules in hardware. */
-	err = ice_create_init_fdir_rule(pf, ICE_FLTR_PTYPE_NONF_IPV4_TCP);
-	if (err)
-		return err;
-
-	err = ice_create_init_fdir_rule(pf, ICE_FLTR_PTYPE_NONF_IPV4_UDP);
-	if (err)
-		return err;
+	for (int i = 0; i < ARRAY_SIZE(dflt_rules); i++) {
+		err = ice_create_init_fdir_rule(pf, dflt_rules[i]);
 
-	err = ice_create_init_fdir_rule(pf, ICE_FLTR_PTYPE_NONF_IPV6_TCP);
-	if (err)
-		return err;
-
-	err = ice_create_init_fdir_rule(pf, ICE_FLTR_PTYPE_NONF_IPV6_UDP);
+		if (err)
+			break;
+	}
 
 	return err;
 }