octeontx2-pf: TC flower offload support for rxqueue mapping

TC rule support to offload rx queue mapping rules.

Eg:
   tc filter add dev eth2 ingress protocol ip flower \
      dst_ip 192.168.8.100  \
      action skbedit queue_mapping 4 skip_sw
      action mirred ingress redirect dev eth5

Packets destined to 192.168.8.100 will be forwarded to rx
queue 4 of eth5 interface.

   tc filter add dev eth2 ingress protocol ip flower \
      dst_ip 192.168.8.100  \
      action skbedit queue_mapping 9 skip_sw

Packets destined to 192.168.8.100 will be forwarded to rx
queue 4 of eth2 interface.

Signed-off-by: Ratheesh Kannoth <rkannoth@marvell.com>
Link: https://lore.kernel.org/r/20230619060638.1032304-1-rkannoth@marvell.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c
index 231c3f0efb60aa7bd72bfd0b7c6aba78af2d657b..8a13df592af6fe36d66c3d33826740c69edaba8d 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c
@@ -396,8 +396,12 @@ static int otx2_tc_parse_actions(struct otx2_nic *nic,
                                return -EOPNOTSUPP;
                        }
                        req->vf = priv->pcifunc & RVU_PFVF_FUNC_MASK;
-                       req->op = NIX_RX_ACTION_DEFAULT;
-                       return 0;
+
+                       /* if op is already set; avoid overwriting the same */
+                       if (!req->op)
+                               req->op = NIX_RX_ACTION_DEFAULT;
+                       break;
+
                case FLOW_ACTION_VLAN_POP:
                        req->vtag0_valid = true;
                        /* use RX_VTAG_TYPE7 which is initialized to strip vlan tag */
@@ -433,6 +437,12 @@ static int otx2_tc_parse_actions(struct otx2_nic *nic,
                case FLOW_ACTION_MARK:
                        mark = act->mark;
                        break;
+
+               case FLOW_ACTION_RX_QUEUE_MAPPING:
+                       req->op = NIX_RX_ACTIONOP_UCAST;
+                       req->index = act->rx_queue;
+                       break;
+
                default:
                        return -EOPNOTSUPP;
                }