summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHyong Youb Kim <hyonkim@cisco.com>2019-03-02 02:42:45 -0800
committerFerruh Yigit <ferruh.yigit@intel.com>2019-03-08 17:52:22 +0100
commit5af7af4d6b0c0e4a5842baaf373b7dbd04303ec2 (patch)
tree663a19eca3d4b93a58d1134a17debefc3188b9a9
parente9434f6f60052519cffb6f447c694da5eba24a47 (diff)
downloaddpdk-5af7af4d6b0c0e4a5842baaf373b7dbd04303ec2.zip
dpdk-5af7af4d6b0c0e4a5842baaf373b7dbd04303ec2.tar.gz
dpdk-5af7af4d6b0c0e4a5842baaf373b7dbd04303ec2.tar.xz
net/enic: enable limited passthru flow action
Some apps like VPP use PASSTHRU+MARK flow rules to offload packet matching to the NIC. Just like MARK+RSS used by OVS-DPDK and others, PASSTHRU+MARK is used to "mark and then receive normally". Recent VIC adapters support such flow rules, so enable PASSTHRU for this limited use case. Signed-off-by: Hyong Youb Kim <hyonkim@cisco.com>
-rw-r--r--doc/guides/nics/enic.rst6
-rw-r--r--doc/guides/rel_notes/release_19_05.rst1
-rw-r--r--drivers/net/enic/enic_flow.c20
3 files changed, 26 insertions, 1 deletions
diff --git a/doc/guides/nics/enic.rst b/doc/guides/nics/enic.rst
index ed093ef..526e58c 100644
--- a/doc/guides/nics/enic.rst
+++ b/doc/guides/nics/enic.rst
@@ -256,7 +256,7 @@ Generic Flow API is supported. The baseline support is:
- Attributes: ingress
- Items: eth, ipv4, ipv6, udp, tcp, vxlan, inner eth, ipv4, ipv6, udp, tcp
- - Actions: queue, mark, drop, flag, rss, and void
+ - Actions: queue, mark, drop, flag, rss, passthru, and void
- Selectors: 'is', 'spec' and 'mask'. 'last' is not supported
- In total, up to 64 bytes of mask is allowed across all headers
@@ -451,6 +451,10 @@ PKT_RX_VLAN_STRIPPED mbuf flags would not be set. This mode is enabled with the
were added. Since there currently is no grouping or priority support,
'catch-all' filters should be added last.
- The supported range of IDs for the 'MARK' action is 0 - 0xFFFD.
+ - RSS and PASSTHRU actions only support "receive normally". They are limited
+ to supporting MARK + RSS and PASSTHRU + MARK to allow the application to mark
+ packets and then receive them normally. These require 1400 series VIC adapters
+ and latest firmware.
- **Statistics**
diff --git a/doc/guides/rel_notes/release_19_05.rst b/doc/guides/rel_notes/release_19_05.rst
index 4a73f29..68417ac 100644
--- a/doc/guides/rel_notes/release_19_05.rst
+++ b/doc/guides/rel_notes/release_19_05.rst
@@ -80,6 +80,7 @@ New Features
* **Updated the enic driver.**
* Added limited support for RSS.
+ * Added limited support for PASSTHRU.
Removed Items
diff --git a/drivers/net/enic/enic_flow.c b/drivers/net/enic/enic_flow.c
index 0f6b6b9..c6ed9e1 100644
--- a/drivers/net/enic/enic_flow.c
+++ b/drivers/net/enic/enic_flow.c
@@ -283,6 +283,7 @@ static const enum rte_flow_action_type enic_supported_actions_v2_id[] = {
RTE_FLOW_ACTION_TYPE_MARK,
RTE_FLOW_ACTION_TYPE_FLAG,
RTE_FLOW_ACTION_TYPE_RSS,
+ RTE_FLOW_ACTION_TYPE_PASSTHRU,
RTE_FLOW_ACTION_TYPE_END,
};
@@ -292,6 +293,7 @@ static const enum rte_flow_action_type enic_supported_actions_v2_drop[] = {
RTE_FLOW_ACTION_TYPE_FLAG,
RTE_FLOW_ACTION_TYPE_DROP,
RTE_FLOW_ACTION_TYPE_RSS,
+ RTE_FLOW_ACTION_TYPE_PASSTHRU,
RTE_FLOW_ACTION_TYPE_END,
};
@@ -302,6 +304,7 @@ static const enum rte_flow_action_type enic_supported_actions_v2_count[] = {
RTE_FLOW_ACTION_TYPE_DROP,
RTE_FLOW_ACTION_TYPE_COUNT,
RTE_FLOW_ACTION_TYPE_RSS,
+ RTE_FLOW_ACTION_TYPE_PASSTHRU,
RTE_FLOW_ACTION_TYPE_END,
};
@@ -1072,6 +1075,7 @@ enic_copy_action_v2(struct enic *enic,
{
enum { FATE = 1, MARK = 2, };
uint32_t overlap = 0;
+ bool passthru = false;
FLOW_TRACE();
@@ -1164,6 +1168,19 @@ enic_copy_action_v2(struct enic *enic,
overlap |= FATE;
break;
}
+ case RTE_FLOW_ACTION_TYPE_PASSTHRU: {
+ /*
+ * Like RSS above, PASSTHRU + MARK may be used to
+ * "mark and then receive normally". MARK usually comes
+ * after PASSTHRU, so remember we have seen passthru
+ * and check for mark later.
+ */
+ if (overlap & FATE)
+ return ENOTSUP;
+ overlap |= FATE;
+ passthru = true;
+ break;
+ }
case RTE_FLOW_ACTION_TYPE_VOID:
continue;
default:
@@ -1171,6 +1188,9 @@ enic_copy_action_v2(struct enic *enic,
break;
}
}
+ /* Only PASSTHRU + MARK is allowed */
+ if (passthru && !(overlap & MARK))
+ return ENOTSUP;
if (!(overlap & FATE))
return ENOTSUP;
enic_action->type = FILTER_ACTION_V2;