Commit 6a57f091 authored by Geetha sowjanya's avatar Geetha sowjanya Committed by David S. Miller
Browse files

octeontx2-pf: Add support for offload tc with skbedit mark action 



Support offloading of skbedit mark action.

For example, to mark with 0x0008, with dest ip 60.60.60.2 on eth2
interface:

 # tc qdisc add dev eth2 ingress
 # tc filter add dev eth2 ingress protocol ip flower \
      dst_ip 60.60.60.2 action skbedit mark 0x0008 skip_sw

Signed-off-by: default avatarGeetha sowjanya <gakula@marvell.com>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 80b7aae9

drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c

+2 −0
Original line number Diff line number Diff line
@@ -1187,6 +1187,8 @@ static int npc_update_rx_entry(struct rvu *rvu, struct rvu_pfvf *pfvf, 
			action.pf_func = target;

			action.op = NIX_RX_ACTIONOP_UCAST;

		}

		if (req->match_id)

			action.match_id = req->match_id;

	}



	entry->action = *(u64 *)&action;

drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h

+2 −0
Original line number Diff line number Diff line
@@ -363,6 +363,7 @@ struct otx2_flow_config { 
	struct list_head	flow_list;

	u32			dmacflt_max_flows;

	u16                     max_flows;

	refcount_t		mark_flows;

	struct list_head	flow_list_tc;

	bool			ntuple;

};
@@ -465,6 +466,7 @@ struct otx2_nic { 
#define OTX2_FLAG_DMACFLTR_SUPPORT		BIT_ULL(14)

#define OTX2_FLAG_PTP_ONESTEP_SYNC		BIT_ULL(15)

#define OTX2_FLAG_ADPTV_INT_COAL_ENABLED BIT_ULL(16)

#define OTX2_FLAG_TC_MARK_ENABLED		BIT_ULL(17)

	u64			flags;

	u64			*cq_op_addr;

drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c

+1 −0
Original line number Diff line number Diff line
@@ -252,6 +252,7 @@ static int otx2_mcam_entry_init(struct otx2_nic *pfvf) 


	pfvf->flags |= OTX2_FLAG_TC_FLOWER_SUPPORT;



	refcount_set(&flow_cfg->mark_flows, 1);

	return 0;

}

drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c

+13 −0
Original line number Diff line number Diff line
@@ -511,7 +511,15 @@ static int otx2_tc_parse_actions(struct otx2_nic *nic, 
			nr_police++;

			break;

		case FLOW_ACTION_MARK:

			if (act->mark & ~OTX2_RX_MATCH_ID_MASK) {

				NL_SET_ERR_MSG_MOD(extack, "Bad flow mark, only 16 bit supported");

				return -EOPNOTSUPP;

			}

			mark = act->mark;

			req->match_id = mark & OTX2_RX_MATCH_ID_MASK;

			req->op = NIX_RX_ACTION_DEFAULT;

			nic->flags |= OTX2_FLAG_TC_MARK_ENABLED;

			refcount_inc(&nic->flow_cfg->mark_flows);

			break;



		case FLOW_ACTION_RX_QUEUE_MAPPING:
@@ -1187,6 +1195,11 @@ static int otx2_tc_del_flow(struct otx2_nic *nic, 
		return -EINVAL;

	}



	/* Disable TC MARK flag if they are no rules with skbedit mark action */

	if (flow_node->req.match_id)

		if (!refcount_dec_and_test(&flow_cfg->mark_flows))

			nic->flags &= ~OTX2_FLAG_TC_MARK_ENABLED;



	if (flow_node->is_act_police) {

		__clear_bit(flow_node->rq, &nic->rq_bmap);

drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c

+3 −0
Original line number Diff line number Diff line
@@ -380,6 +380,9 @@ static void otx2_rcv_pkt_handler(struct otx2_nic *pfvf, 
	if (pfvf->netdev->features & NETIF_F_RXCSUM)

		skb->ip_summed = CHECKSUM_UNNECESSARY;



	if (pfvf->flags & OTX2_FLAG_TC_MARK_ENABLED)

		skb->mark = parse->match_id;



	skb_mark_for_recycle(skb);



	napi_gro_frags(napi);