Commit 21e8a49a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'nfp-Offload-MPLS-actions' 



John Hurley says:

====================
nfp: Offload MPLS actions

The module act_mpls has recently been added to the kernel. This allows the
manipulation of MPLS headers on packets including push, pop and modify.
Add these new actions and parameters to the intermediate representation
API for hardware offload. Follow this by implementing the offload of these
MPLS actions in the NFP driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 658688ce e03e47a3

drivers/net/ethernet/netronome/nfp/flower/action.c

+120 −0
Original line number Diff line number Diff line
@@ -2,10 +2,12 @@ 
/* Copyright (C) 2017-2018 Netronome Systems, Inc. */



#include <linux/bitfield.h>

#include <linux/mpls.h>

#include <net/pkt_cls.h>

#include <net/tc_act/tc_csum.h>

#include <net/tc_act/tc_gact.h>

#include <net/tc_act/tc_mirred.h>

#include <net/tc_act/tc_mpls.h>

#include <net/tc_act/tc_pedit.h>

#include <net/tc_act/tc_vlan.h>

#include <net/tc_act/tc_tunnel_key.h>
@@ -25,6 +27,80 @@ 
						 NFP_FL_TUNNEL_KEY | \

						 NFP_FL_TUNNEL_GENEVE_OPT)



static int

nfp_fl_push_mpls(struct nfp_fl_push_mpls *push_mpls,

		 const struct flow_action_entry *act,

		 struct netlink_ext_ack *extack)

{

	size_t act_size = sizeof(struct nfp_fl_push_mpls);

	u32 mpls_lse = 0;



	push_mpls->head.jump_id = NFP_FL_ACTION_OPCODE_PUSH_MPLS;

	push_mpls->head.len_lw = act_size >> NFP_FL_LW_SIZ;



	/* BOS is optional in the TC action but required for offload. */

	if (act->mpls_push.bos != ACT_MPLS_BOS_NOT_SET) {

		mpls_lse |= act->mpls_push.bos << MPLS_LS_S_SHIFT;

	} else {

		NL_SET_ERR_MSG_MOD(extack, "unsupported offload: BOS field must explicitly be set for MPLS push");

		return -EOPNOTSUPP;

	}



	/* Leave MPLS TC as a default value of 0 if not explicitly set. */

	if (act->mpls_push.tc != ACT_MPLS_TC_NOT_SET)

		mpls_lse |= act->mpls_push.tc << MPLS_LS_TC_SHIFT;



	/* Proto, label and TTL are enforced and verified for MPLS push. */

	mpls_lse |= act->mpls_push.label << MPLS_LS_LABEL_SHIFT;

	mpls_lse |= act->mpls_push.ttl << MPLS_LS_TTL_SHIFT;

	push_mpls->ethtype = act->mpls_push.proto;

	push_mpls->lse = cpu_to_be32(mpls_lse);



	return 0;

}



static void

nfp_fl_pop_mpls(struct nfp_fl_pop_mpls *pop_mpls,

		const struct flow_action_entry *act)

{

	size_t act_size = sizeof(struct nfp_fl_pop_mpls);



	pop_mpls->head.jump_id = NFP_FL_ACTION_OPCODE_POP_MPLS;

	pop_mpls->head.len_lw = act_size >> NFP_FL_LW_SIZ;

	pop_mpls->ethtype = act->mpls_pop.proto;

}



static void

nfp_fl_set_mpls(struct nfp_fl_set_mpls *set_mpls,

		const struct flow_action_entry *act)

{

	size_t act_size = sizeof(struct nfp_fl_set_mpls);

	u32 mpls_lse = 0, mpls_mask = 0;



	set_mpls->head.jump_id = NFP_FL_ACTION_OPCODE_SET_MPLS;

	set_mpls->head.len_lw = act_size >> NFP_FL_LW_SIZ;



	if (act->mpls_mangle.label != ACT_MPLS_LABEL_NOT_SET) {

		mpls_lse |= act->mpls_mangle.label << MPLS_LS_LABEL_SHIFT;

		mpls_mask |= MPLS_LS_LABEL_MASK;

	}

	if (act->mpls_mangle.tc != ACT_MPLS_TC_NOT_SET) {

		mpls_lse |= act->mpls_mangle.tc << MPLS_LS_TC_SHIFT;

		mpls_mask |= MPLS_LS_TC_MASK;

	}

	if (act->mpls_mangle.bos != ACT_MPLS_BOS_NOT_SET) {

		mpls_lse |= act->mpls_mangle.bos << MPLS_LS_S_SHIFT;

		mpls_mask |= MPLS_LS_S_MASK;

	}

	if (act->mpls_mangle.ttl) {

		mpls_lse |= act->mpls_mangle.ttl << MPLS_LS_TTL_SHIFT;

		mpls_mask |= MPLS_LS_TTL_MASK;

	}



	set_mpls->lse = cpu_to_be32(mpls_lse);

	set_mpls->lse_mask = cpu_to_be32(mpls_mask);

}



static void nfp_fl_pop_vlan(struct nfp_fl_pop_vlan *pop_vlan)

{

	size_t act_size = sizeof(struct nfp_fl_pop_vlan);
@@ -869,7 +945,10 @@ nfp_flower_loop_action(struct nfp_app *app, const struct flow_action_entry *act, 
	struct nfp_fl_set_ipv4_tun *set_tun;

	struct nfp_fl_pre_tunnel *pre_tun;

	struct nfp_fl_push_vlan *psh_v;

	struct nfp_fl_push_mpls *psh_m;

	struct nfp_fl_pop_vlan *pop_v;

	struct nfp_fl_pop_mpls *pop_m;

	struct nfp_fl_set_mpls *set_m;

	int err;



	switch (act->id) {
@@ -975,6 +1054,47 @@ nfp_flower_loop_action(struct nfp_app *app, const struct flow_action_entry *act, 
		 */

		*csum_updated &= ~act->csum_flags;

		break;

	case FLOW_ACTION_MPLS_PUSH:

		if (*a_len +

		    sizeof(struct nfp_fl_push_mpls) > NFP_FL_MAX_A_SIZ) {

			NL_SET_ERR_MSG_MOD(extack, "unsupported offload: maximum allowed action list size exceeded at push MPLS");

			return -EOPNOTSUPP;

		}



		psh_m = (struct nfp_fl_push_mpls *)&nfp_fl->action_data[*a_len];

		nfp_fl->meta.shortcut = cpu_to_be32(NFP_FL_SC_ACT_NULL);



		err = nfp_fl_push_mpls(psh_m, act, extack);

		if (err)

			return err;

		*a_len += sizeof(struct nfp_fl_push_mpls);

		break;

	case FLOW_ACTION_MPLS_POP:

		if (*a_len +

		    sizeof(struct nfp_fl_pop_mpls) > NFP_FL_MAX_A_SIZ) {

			NL_SET_ERR_MSG_MOD(extack, "unsupported offload: maximum allowed action list size exceeded at pop MPLS");

			return -EOPNOTSUPP;

		}



		pop_m = (struct nfp_fl_pop_mpls *)&nfp_fl->action_data[*a_len];

		nfp_fl->meta.shortcut = cpu_to_be32(NFP_FL_SC_ACT_NULL);



		nfp_fl_pop_mpls(pop_m, act);

		*a_len += sizeof(struct nfp_fl_pop_mpls);

		break;

	case FLOW_ACTION_MPLS_MANGLE:

		if (*a_len +

		    sizeof(struct nfp_fl_set_mpls) > NFP_FL_MAX_A_SIZ) {

			NL_SET_ERR_MSG_MOD(extack, "unsupported offload: maximum allowed action list size exceeded at set MPLS");

			return -EOPNOTSUPP;

		}



		set_m = (struct nfp_fl_set_mpls *)&nfp_fl->action_data[*a_len];

		nfp_fl->meta.shortcut = cpu_to_be32(NFP_FL_SC_ACT_NULL);



		nfp_fl_set_mpls(set_m, act);

		*a_len += sizeof(struct nfp_fl_set_mpls);

		break;

	default:

		/* Currently we do not handle any other actions. */

		NL_SET_ERR_MSG_MOD(extack, "unsupported offload: unsupported action in action list");

drivers/net/ethernet/netronome/nfp/flower/cmsg.h

+21 −0
Original line number Diff line number Diff line
@@ -68,8 +68,11 @@ 
#define NFP_FL_ACTION_OPCODE_OUTPUT		0

#define NFP_FL_ACTION_OPCODE_PUSH_VLAN		1

#define NFP_FL_ACTION_OPCODE_POP_VLAN		2

#define NFP_FL_ACTION_OPCODE_PUSH_MPLS		3

#define NFP_FL_ACTION_OPCODE_POP_MPLS		4

#define NFP_FL_ACTION_OPCODE_SET_IPV4_TUNNEL	6

#define NFP_FL_ACTION_OPCODE_SET_ETHERNET	7

#define NFP_FL_ACTION_OPCODE_SET_MPLS		8

#define NFP_FL_ACTION_OPCODE_SET_IPV4_ADDRS	9

#define NFP_FL_ACTION_OPCODE_SET_IPV4_TTL_TOS	10

#define NFP_FL_ACTION_OPCODE_SET_IPV6_SRC	11
@@ -232,6 +235,24 @@ struct nfp_fl_push_geneve { 
	u8 opt_data[];

};



struct nfp_fl_push_mpls {

	struct nfp_fl_act_head head;

	__be16 ethtype;

	__be32 lse;

};



struct nfp_fl_pop_mpls {

	struct nfp_fl_act_head head;

	__be16 ethtype;

};



struct nfp_fl_set_mpls {

	struct nfp_fl_act_head head;

	__be16 reserved;

	__be32 lse_mask;

	__be32 lse;

};



/* Metadata with L2 (1W/4B)

 * ----------------------------------------------------------------

 *    3                   2                   1

include/net/flow_offload.h

+19 −0
Original line number Diff line number Diff line
@@ -131,6 +131,9 @@ enum flow_action_id { 
	FLOW_ACTION_SAMPLE,

	FLOW_ACTION_POLICE,

	FLOW_ACTION_CT,

	FLOW_ACTION_MPLS_PUSH,

	FLOW_ACTION_MPLS_POP,

	FLOW_ACTION_MPLS_MANGLE,

};



/* This is mirroring enum pedit_header_type definition for easy mapping between
@@ -184,6 +187,22 @@ struct flow_action_entry { 
			int action;

			u16 zone;

		} ct;

		struct {				/* FLOW_ACTION_MPLS_PUSH */

			u32		label;

			__be16		proto;

			u8		tc;

			u8		bos;

			u8		ttl;

		} mpls_push;

		struct {				/* FLOW_ACTION_MPLS_POP */

			__be16		proto;

		} mpls_pop;

		struct {				/* FLOW_ACTION_MPLS_MANGLE */

			u32		label;

			u8		tc;

			u8		bos;

			u8		ttl;

		} mpls_mangle;

	};

};

include/net/tc_act/tc_mpls.h

+75 −0
Original line number Diff line number Diff line
@@ -27,4 +27,79 @@ struct tcf_mpls { 
};

#define to_mpls(a) ((struct tcf_mpls *)a)



static inline bool is_tcf_mpls(const struct tc_action *a)

{

#ifdef CONFIG_NET_CLS_ACT

	if (a->ops && a->ops->id == TCA_ID_MPLS)

		return true;

#endif

	return false;

}



static inline u32 tcf_mpls_action(const struct tc_action *a)

{

	u32 tcfm_action;



	rcu_read_lock();

	tcfm_action = rcu_dereference(to_mpls(a)->mpls_p)->tcfm_action;

	rcu_read_unlock();



	return tcfm_action;

}



static inline __be16 tcf_mpls_proto(const struct tc_action *a)

{

	__be16 tcfm_proto;



	rcu_read_lock();

	tcfm_proto = rcu_dereference(to_mpls(a)->mpls_p)->tcfm_proto;

	rcu_read_unlock();



	return tcfm_proto;

}



static inline u32 tcf_mpls_label(const struct tc_action *a)

{

	u32 tcfm_label;



	rcu_read_lock();

	tcfm_label = rcu_dereference(to_mpls(a)->mpls_p)->tcfm_label;

	rcu_read_unlock();



	return tcfm_label;

}



static inline u8 tcf_mpls_tc(const struct tc_action *a)

{

	u8 tcfm_tc;



	rcu_read_lock();

	tcfm_tc = rcu_dereference(to_mpls(a)->mpls_p)->tcfm_tc;

	rcu_read_unlock();



	return tcfm_tc;

}



static inline u8 tcf_mpls_bos(const struct tc_action *a)

{

	u8 tcfm_bos;



	rcu_read_lock();

	tcfm_bos = rcu_dereference(to_mpls(a)->mpls_p)->tcfm_bos;

	rcu_read_unlock();



	return tcfm_bos;

}



static inline u8 tcf_mpls_ttl(const struct tc_action *a)

{

	u8 tcfm_ttl;



	rcu_read_lock();

	tcfm_ttl = rcu_dereference(to_mpls(a)->mpls_p)->tcfm_ttl;

	rcu_read_unlock();



	return tcfm_ttl;

}



#endif /* __NET_TC_MPLS_H */

net/sched/cls_api.c

+25 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <net/tc_act/tc_sample.h>

#include <net/tc_act/tc_skbedit.h>

#include <net/tc_act/tc_ct.h>

#include <net/tc_act/tc_mpls.h>



extern const struct nla_policy rtm_tca_policy[TCA_MAX + 1];
@@ -3269,6 +3270,30 @@ int tc_setup_flow_action(struct flow_action *flow_action, 
			entry->id = FLOW_ACTION_CT;

			entry->ct.action = tcf_ct_action(act);

			entry->ct.zone = tcf_ct_zone(act);

		} else if (is_tcf_mpls(act)) {

			switch (tcf_mpls_action(act)) {

			case TCA_MPLS_ACT_PUSH:

				entry->id = FLOW_ACTION_MPLS_PUSH;

				entry->mpls_push.proto = tcf_mpls_proto(act);

				entry->mpls_push.label = tcf_mpls_label(act);

				entry->mpls_push.tc = tcf_mpls_tc(act);

				entry->mpls_push.bos = tcf_mpls_bos(act);

				entry->mpls_push.ttl = tcf_mpls_ttl(act);

				break;

			case TCA_MPLS_ACT_POP:

				entry->id = FLOW_ACTION_MPLS_POP;

				entry->mpls_pop.proto = tcf_mpls_proto(act);

				break;

			case TCA_MPLS_ACT_MODIFY:

				entry->id = FLOW_ACTION_MPLS_MANGLE;

				entry->mpls_mangle.label = tcf_mpls_label(act);

				entry->mpls_mangle.tc = tcf_mpls_tc(act);

				entry->mpls_mangle.bos = tcf_mpls_bos(act);

				entry->mpls_mangle.ttl = tcf_mpls_ttl(act);

				break;

			default:

				goto err_out;

			}

		} else {

			goto err_out;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE