* [PATCH iwl-next] ice: Deduplicate tc action setup
@ 2024-04-15 8:49 ` Marcin Szycik
0 siblings, 0 replies; 6+ messages in thread
From: Marcin Szycik @ 2024-04-15 8:49 UTC (permalink / raw
To: intel-wired-lan; +Cc: netdev, andrii.staikov, Marcin Szycik, Mateusz Polchlopek
ice_tc_setup_redirect_action() and ice_tc_setup_mirror_action() are almost
identical, except for setting filter action. Reduce them to one function
with an extra param, which handles both cases.
Reviewed-by: Mateusz Polchlopek <mateusz.polchlopek@intel.com>
Signed-off-by: Marcin Szycik <marcin.szycik@linux.intel.com>
---
drivers/net/ethernet/intel/ice/ice_tc_lib.c | 56 ++++++---------------
1 file changed, 15 insertions(+), 41 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_tc_lib.c b/drivers/net/ethernet/intel/ice/ice_tc_lib.c
index 4d8f808f4898..8553c56dc95d 100644
--- a/drivers/net/ethernet/intel/ice/ice_tc_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_tc_lib.c
@@ -669,13 +669,19 @@ static bool ice_tc_is_dev_uplink(struct net_device *dev)
return netif_is_ice(dev) || ice_is_tunnel_supported(dev);
}
-static int ice_tc_setup_redirect_action(struct net_device *filter_dev,
- struct ice_tc_flower_fltr *fltr,
- struct net_device *target_dev)
+static int ice_tc_setup_action(struct net_device *filter_dev,
+ struct ice_tc_flower_fltr *fltr,
+ struct net_device *target_dev,
+ enum ice_sw_fwd_act_type action)
{
struct ice_repr *repr;
- fltr->action.fltr_act = ICE_FWD_TO_VSI;
+ if (action != ICE_FWD_TO_VSI && action != ICE_MIRROR_PACKET) {
+ NL_SET_ERR_MSG_MOD(fltr->extack, "Unsupported action to setup provided");
+ return -EINVAL;
+ }
+
+ fltr->action.fltr_act = action;
if (ice_is_port_repr_netdev(filter_dev) &&
ice_is_port_repr_netdev(target_dev)) {
@@ -723,41 +729,6 @@ ice_tc_setup_drop_action(struct net_device *filter_dev,
return 0;
}
-static int ice_tc_setup_mirror_action(struct net_device *filter_dev,
- struct ice_tc_flower_fltr *fltr,
- struct net_device *target_dev)
-{
- struct ice_repr *repr;
-
- fltr->action.fltr_act = ICE_MIRROR_PACKET;
-
- if (ice_is_port_repr_netdev(filter_dev) &&
- ice_is_port_repr_netdev(target_dev)) {
- repr = ice_netdev_to_repr(target_dev);
-
- fltr->dest_vsi = repr->src_vsi;
- fltr->direction = ICE_ESWITCH_FLTR_EGRESS;
- } else if (ice_is_port_repr_netdev(filter_dev) &&
- ice_tc_is_dev_uplink(target_dev)) {
- repr = ice_netdev_to_repr(filter_dev);
-
- fltr->dest_vsi = repr->src_vsi->back->eswitch.uplink_vsi;
- fltr->direction = ICE_ESWITCH_FLTR_EGRESS;
- } else if (ice_tc_is_dev_uplink(filter_dev) &&
- ice_is_port_repr_netdev(target_dev)) {
- repr = ice_netdev_to_repr(target_dev);
-
- fltr->dest_vsi = repr->src_vsi;
- fltr->direction = ICE_ESWITCH_FLTR_INGRESS;
- } else {
- NL_SET_ERR_MSG_MOD(fltr->extack,
- "Unsupported netdevice in switchdev mode");
- return -EINVAL;
- }
-
- return 0;
-}
-
static int ice_eswitch_tc_parse_action(struct net_device *filter_dev,
struct ice_tc_flower_fltr *fltr,
struct flow_action_entry *act)
@@ -773,16 +744,19 @@ static int ice_eswitch_tc_parse_action(struct net_device *filter_dev,
break;
case FLOW_ACTION_REDIRECT:
- err = ice_tc_setup_redirect_action(filter_dev, fltr, act->dev);
+ err = ice_tc_setup_action(filter_dev, fltr,
+ act->dev, ICE_FWD_TO_VSI);
if (err)
return err;
break;
case FLOW_ACTION_MIRRED:
- err = ice_tc_setup_mirror_action(filter_dev, fltr, act->dev);
+ err = ice_tc_setup_action(filter_dev, fltr,
+ act->dev, ICE_MIRROR_PACKET);
if (err)
return err;
+
break;
default:
--
2.41.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Intel-wired-lan] [PATCH iwl-next] ice: Deduplicate tc action setup
@ 2024-04-15 8:49 ` Marcin Szycik
0 siblings, 0 replies; 6+ messages in thread
From: Marcin Szycik @ 2024-04-15 8:49 UTC (permalink / raw
To: intel-wired-lan; +Cc: Mateusz Polchlopek, netdev, Marcin Szycik, andrii.staikov
ice_tc_setup_redirect_action() and ice_tc_setup_mirror_action() are almost
identical, except for setting filter action. Reduce them to one function
with an extra param, which handles both cases.
Reviewed-by: Mateusz Polchlopek <mateusz.polchlopek@intel.com>
Signed-off-by: Marcin Szycik <marcin.szycik@linux.intel.com>
---
drivers/net/ethernet/intel/ice/ice_tc_lib.c | 56 ++++++---------------
1 file changed, 15 insertions(+), 41 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_tc_lib.c b/drivers/net/ethernet/intel/ice/ice_tc_lib.c
index 4d8f808f4898..8553c56dc95d 100644
--- a/drivers/net/ethernet/intel/ice/ice_tc_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_tc_lib.c
@@ -669,13 +669,19 @@ static bool ice_tc_is_dev_uplink(struct net_device *dev)
return netif_is_ice(dev) || ice_is_tunnel_supported(dev);
}
-static int ice_tc_setup_redirect_action(struct net_device *filter_dev,
- struct ice_tc_flower_fltr *fltr,
- struct net_device *target_dev)
+static int ice_tc_setup_action(struct net_device *filter_dev,
+ struct ice_tc_flower_fltr *fltr,
+ struct net_device *target_dev,
+ enum ice_sw_fwd_act_type action)
{
struct ice_repr *repr;
- fltr->action.fltr_act = ICE_FWD_TO_VSI;
+ if (action != ICE_FWD_TO_VSI && action != ICE_MIRROR_PACKET) {
+ NL_SET_ERR_MSG_MOD(fltr->extack, "Unsupported action to setup provided");
+ return -EINVAL;
+ }
+
+ fltr->action.fltr_act = action;
if (ice_is_port_repr_netdev(filter_dev) &&
ice_is_port_repr_netdev(target_dev)) {
@@ -723,41 +729,6 @@ ice_tc_setup_drop_action(struct net_device *filter_dev,
return 0;
}
-static int ice_tc_setup_mirror_action(struct net_device *filter_dev,
- struct ice_tc_flower_fltr *fltr,
- struct net_device *target_dev)
-{
- struct ice_repr *repr;
-
- fltr->action.fltr_act = ICE_MIRROR_PACKET;
-
- if (ice_is_port_repr_netdev(filter_dev) &&
- ice_is_port_repr_netdev(target_dev)) {
- repr = ice_netdev_to_repr(target_dev);
-
- fltr->dest_vsi = repr->src_vsi;
- fltr->direction = ICE_ESWITCH_FLTR_EGRESS;
- } else if (ice_is_port_repr_netdev(filter_dev) &&
- ice_tc_is_dev_uplink(target_dev)) {
- repr = ice_netdev_to_repr(filter_dev);
-
- fltr->dest_vsi = repr->src_vsi->back->eswitch.uplink_vsi;
- fltr->direction = ICE_ESWITCH_FLTR_EGRESS;
- } else if (ice_tc_is_dev_uplink(filter_dev) &&
- ice_is_port_repr_netdev(target_dev)) {
- repr = ice_netdev_to_repr(target_dev);
-
- fltr->dest_vsi = repr->src_vsi;
- fltr->direction = ICE_ESWITCH_FLTR_INGRESS;
- } else {
- NL_SET_ERR_MSG_MOD(fltr->extack,
- "Unsupported netdevice in switchdev mode");
- return -EINVAL;
- }
-
- return 0;
-}
-
static int ice_eswitch_tc_parse_action(struct net_device *filter_dev,
struct ice_tc_flower_fltr *fltr,
struct flow_action_entry *act)
@@ -773,16 +744,19 @@ static int ice_eswitch_tc_parse_action(struct net_device *filter_dev,
break;
case FLOW_ACTION_REDIRECT:
- err = ice_tc_setup_redirect_action(filter_dev, fltr, act->dev);
+ err = ice_tc_setup_action(filter_dev, fltr,
+ act->dev, ICE_FWD_TO_VSI);
if (err)
return err;
break;
case FLOW_ACTION_MIRRED:
- err = ice_tc_setup_mirror_action(filter_dev, fltr, act->dev);
+ err = ice_tc_setup_action(filter_dev, fltr,
+ act->dev, ICE_MIRROR_PACKET);
if (err)
return err;
+
break;
default:
--
2.41.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH iwl-next] ice: Deduplicate tc action setup
2024-04-15 8:49 ` [Intel-wired-lan] " Marcin Szycik
@ 2024-04-16 11:22 ` Simon Horman
-1 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2024-04-16 11:22 UTC (permalink / raw
To: Marcin Szycik; +Cc: intel-wired-lan, netdev, andrii.staikov, Mateusz Polchlopek
On Mon, Apr 15, 2024 at 10:49:07AM +0200, Marcin Szycik wrote:
> ice_tc_setup_redirect_action() and ice_tc_setup_mirror_action() are almost
> identical, except for setting filter action. Reduce them to one function
> with an extra param, which handles both cases.
>
> Reviewed-by: Mateusz Polchlopek <mateusz.polchlopek@intel.com>
> Signed-off-by: Marcin Szycik <marcin.szycik@linux.intel.com>
> ---
> drivers/net/ethernet/intel/ice/ice_tc_lib.c | 56 ++++++---------------
> 1 file changed, 15 insertions(+), 41 deletions(-)
Less is more :)
Reviewed-by: Simon Horman <horms@kernel.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Intel-wired-lan] [PATCH iwl-next] ice: Deduplicate tc action setup
@ 2024-04-16 11:22 ` Simon Horman
0 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2024-04-16 11:22 UTC (permalink / raw
To: Marcin Szycik; +Cc: netdev, Mateusz Polchlopek, intel-wired-lan, andrii.staikov
On Mon, Apr 15, 2024 at 10:49:07AM +0200, Marcin Szycik wrote:
> ice_tc_setup_redirect_action() and ice_tc_setup_mirror_action() are almost
> identical, except for setting filter action. Reduce them to one function
> with an extra param, which handles both cases.
>
> Reviewed-by: Mateusz Polchlopek <mateusz.polchlopek@intel.com>
> Signed-off-by: Marcin Szycik <marcin.szycik@linux.intel.com>
> ---
> drivers/net/ethernet/intel/ice/ice_tc_lib.c | 56 ++++++---------------
> 1 file changed, 15 insertions(+), 41 deletions(-)
Less is more :)
Reviewed-by: Simon Horman <horms@kernel.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [Intel-wired-lan] [PATCH iwl-next] ice: Deduplicate tc action setup
2024-04-15 8:49 ` [Intel-wired-lan] " Marcin Szycik
@ 2024-05-03 6:23 ` Buvaneswaran, Sujai
-1 siblings, 0 replies; 6+ messages in thread
From: Buvaneswaran, Sujai @ 2024-05-03 6:23 UTC (permalink / raw
To: Marcin Szycik, intel-wired-lan@lists.osuosl.org
Cc: Polchlopek, Mateusz, netdev@vger.kernel.org, Staikov, Andrii
> -----Original Message-----
> From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of
> Marcin Szycik
> Sent: Monday, April 15, 2024 2:19 PM
> To: intel-wired-lan@lists.osuosl.org
> Cc: Polchlopek, Mateusz <mateusz.polchlopek@intel.com>;
> netdev@vger.kernel.org; Marcin Szycik <marcin.szycik@linux.intel.com>;
> Staikov, Andrii <andrii.staikov@intel.com>
> Subject: [Intel-wired-lan] [PATCH iwl-next] ice: Deduplicate tc action setup
>
> ice_tc_setup_redirect_action() and ice_tc_setup_mirror_action() are almost
> identical, except for setting filter action. Reduce them to one function with an
> extra param, which handles both cases.
>
> Reviewed-by: Mateusz Polchlopek <mateusz.polchlopek@intel.com>
> Signed-off-by: Marcin Szycik <marcin.szycik@linux.intel.com>
> ---
> drivers/net/ethernet/intel/ice/ice_tc_lib.c | 56 ++++++---------------
> 1 file changed, 15 insertions(+), 41 deletions(-)
>
Tested-by: Sujai Buvaneswaran <sujai.buvaneswaran@intel.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Intel-wired-lan] [PATCH iwl-next] ice: Deduplicate tc action setup
@ 2024-05-03 6:23 ` Buvaneswaran, Sujai
0 siblings, 0 replies; 6+ messages in thread
From: Buvaneswaran, Sujai @ 2024-05-03 6:23 UTC (permalink / raw
To: Marcin Szycik, intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org, Staikov, Andrii, Polchlopek, Mateusz
> -----Original Message-----
> From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of
> Marcin Szycik
> Sent: Monday, April 15, 2024 2:19 PM
> To: intel-wired-lan@lists.osuosl.org
> Cc: Polchlopek, Mateusz <mateusz.polchlopek@intel.com>;
> netdev@vger.kernel.org; Marcin Szycik <marcin.szycik@linux.intel.com>;
> Staikov, Andrii <andrii.staikov@intel.com>
> Subject: [Intel-wired-lan] [PATCH iwl-next] ice: Deduplicate tc action setup
>
> ice_tc_setup_redirect_action() and ice_tc_setup_mirror_action() are almost
> identical, except for setting filter action. Reduce them to one function with an
> extra param, which handles both cases.
>
> Reviewed-by: Mateusz Polchlopek <mateusz.polchlopek@intel.com>
> Signed-off-by: Marcin Szycik <marcin.szycik@linux.intel.com>
> ---
> drivers/net/ethernet/intel/ice/ice_tc_lib.c | 56 ++++++---------------
> 1 file changed, 15 insertions(+), 41 deletions(-)
>
Tested-by: Sujai Buvaneswaran <sujai.buvaneswaran@intel.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-05-03 6:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-15 8:49 [PATCH iwl-next] ice: Deduplicate tc action setup Marcin Szycik
2024-04-15 8:49 ` [Intel-wired-lan] " Marcin Szycik
2024-04-16 11:22 ` Simon Horman
2024-04-16 11:22 ` [Intel-wired-lan] " Simon Horman
2024-05-03 6:23 ` Buvaneswaran, Sujai
2024-05-03 6:23 ` Buvaneswaran, Sujai
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.