@@ -1773,6 +1773,13 @@ static int ib_spec_to_kern_spec(struct ibv_flow_spec *ib_spec,
memcpy(&kern_spec->gre.mask, &ib_spec->gre.mask,
sizeof(struct ibv_flow_gre_filter));
break;
+ case IBV_FLOW_SPEC_MPLS:
+ kern_spec->mpls.size = sizeof(struct ib_uverbs_flow_spec_mpls);
+ memcpy(&kern_spec->mpls.val, &ib_spec->mpls.val,
+ sizeof(struct ibv_flow_mpls_filter));
+ memcpy(&kern_spec->mpls.mask, &ib_spec->mpls.mask,
+ sizeof(struct ibv_flow_mpls_filter));
+ break;
case IBV_FLOW_SPEC_VXLAN_TUNNEL:
ret = get_filters_size(ib_spec, kern_spec,
&ib_filter_size, &kern_filter_size,
@@ -269,6 +269,7 @@ struct ibv_kern_spec {
struct ib_uverbs_flow_spec_ipv6 ipv6;
struct ib_uverbs_flow_spec_gre gre;
struct ib_uverbs_flow_spec_tunnel tunnel;
+ struct ib_uverbs_flow_spec_mpls mpls;
struct ib_uverbs_flow_spec_action_tag flow_tag;
struct ib_uverbs_flow_spec_action_drop drop;
struct ib_uverbs_flow_spec_action_handle handle;
@@ -70,6 +70,7 @@ IBV_FLOW_SPEC_TCP = 0x40, /* Flow specification of TCP h
IBV_FLOW_SPEC_UDP = 0x41, /* Flow specification of UDP header */
IBV_FLOW_SPEC_VXLAN_TUNNEL = 0x50, /* Flow specification of VXLAN header */
IBV_FLOW_SPEC_GRE = 0x51, /* Flow specification of GRE header */
+IBV_FLOW_SPEC_MPLS = 0x60, /* Flow specification of MPLS header */
IBV_FLOW_SPEC_INNER = 0x100, /* Flag making L2/L3/L4 specifications to be applied on the inner header */
IBV_FLOW_SPEC_ACTION_TAG = 0x1000, /* Action tagging matched packet */
IBV_FLOW_SPEC_ACTION_DROP = 0x1001, /* Action dropping matched packet */
@@ -111,7 +112,23 @@ In addition to the domain, there is priority within each of the domains.
A lower priority numeric value (higher priority) takes precedence over matching rules with higher numeric priority value (lower priority).
It is important to note that the priority value of a flow spec is used not only to establish the precedence of conflicting flow matches
but also as a way to abstract the order on which flow specs are tested for matches. Flows with higher priorities will be tested before flows with lower priorities.
-.PP
+
+.SS Rules definition ordering
+An application can provide the ibv_flow_spec_xxx rules in an un-ordered scheme. In this case, each spec should be well
+defined and match a specific network header layer.
+In some cases, when certain flow spec types are present in the spec list, it is required to provide the list in an
+ordered manner so that the position of that flow spec type in the protocol stack is strictly defined.
+This is essential to represent many of the encapsulation tunnel protocols.
+.br
+
+The flow spec types which require this sort of ordering are:
+.br
+.B 1. IBV_FLOW_SPEC_MPLS -
+.br
+Since MPLS header can appear at several locations in the protocol stack and can also be
+encapsulated on top of different layers, it is required to place this spec according to its exact location in the
+protocol stack.
+.br
.SS ibv_destroy_flow()
destroys the flow
.I flow_id\fR.
@@ -1401,6 +1401,7 @@ enum ibv_flow_spec_type {
IBV_FLOW_SPEC_UDP = 0x41,
IBV_FLOW_SPEC_VXLAN_TUNNEL = 0x50,
IBV_FLOW_SPEC_GRE = 0x51,
+ IBV_FLOW_SPEC_MPLS = 0x60,
IBV_FLOW_SPEC_INNER = 0x100,
IBV_FLOW_SPEC_ACTION_TAG = 0x1000,
IBV_FLOW_SPEC_ACTION_DROP = 0x1001,
@@ -1513,6 +1514,22 @@ struct ibv_flow_spec_gre {
struct ibv_flow_gre_filter mask;
};
+struct ibv_flow_mpls_filter {
+ /* The field includes the entire MPLS label:
+ * bits 0:19 - label value field.
+ * bits 20:22 - traffic class field.
+ * bits 23 - bottom of stack bit.
+ * bits 24:31 - ttl field.
+ */
+ uint32_t label;
+};
+
+struct ibv_flow_spec_mpls {
+ enum ibv_flow_spec_type type;
+ uint16_t size;
+ struct ibv_flow_mpls_filter val;
+ struct ibv_flow_mpls_filter mask;
+};
struct ibv_flow_tunnel_filter {
uint32_t tunnel_id;
@@ -1556,6 +1573,7 @@ struct ibv_flow_spec {
struct ibv_flow_spec_esp esp;
struct ibv_flow_spec_tunnel tunnel;
struct ibv_flow_spec_gre gre;
+ struct ibv_flow_spec_mpls mpls;
struct ibv_flow_spec_action_tag flow_tag;
struct ibv_flow_spec_action_drop drop;
struct ibv_flow_spec_action_handle handle;