Signed-off-by: Eli Britstein <el...@mellanox.com>
Reviewed-by: Oz Shlomo <o...@mellanox.com>
---
Documentation/howto/dpdk.rst | 1 +
NEWS | 4 ++--
lib/netdev-offload-dpdk.c | 41 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/Documentation/howto/dpdk.rst b/Documentation/howto/dpdk.rst
index 0e9939ddd..c440bf28e 100644
--- a/Documentation/howto/dpdk.rst
+++ b/Documentation/howto/dpdk.rst
@@ -393,6 +393,7 @@ Supported actions for hardware offload are:
- Output.
- Drop.
- Modification of Ethernet (mod_dl_src/mod_dl_dst).
+- Modification of IPv4 (mod_nw_src/mod_nw_dst/mod_nw_ttl).
Further Reading
---------------
diff --git a/NEWS b/NEWS
index acb27b99d..ca39a7253 100644
--- a/NEWS
+++ b/NEWS
@@ -26,8 +26,8 @@ Post-v2.12.0
* DPDK ring ports (dpdkr) are deprecated and will be removed in next
releases.
* Add support for DPDK 19.11.
- * Add hardware offload support for output, drop and set MAC actions
- (experimental).
+ * Add hardware offload support for output, drop and set actions of
+ MAC and IPv4 (experimental).
- 'ovs-appctl dpctl/dump-flows' can now show offloaded=partial for
partially offloaded flows, dp:dpdk for fully offloaded by dpdk, and
type filter supports new filters: "dpdk" and "partially-offloaded".
diff --git a/lib/netdev-offload-dpdk.c b/lib/netdev-offload-dpdk.c
index 8e99f181c..e0a9f5cdb 100644
--- a/lib/netdev-offload-dpdk.c
+++ b/lib/netdev-offload-dpdk.c
@@ -384,6 +384,29 @@ dump_flow_action(struct ds *s, const struct
rte_flow_action *actions)
} else {
ds_put_format(s, " Set-mac-%s = null\n", dirstr);
}
+ } else if (actions->type == RTE_FLOW_ACTION_TYPE_SET_IPV4_SRC ||
+ actions->type == RTE_FLOW_ACTION_TYPE_SET_IPV4_DST) {
+ const struct rte_flow_action_set_ipv4 *set_ipv4 = actions->conf;
+ char *dirstr = actions->type == RTE_FLOW_ACTION_TYPE_SET_IPV4_DST
+ ? "dst" : "src";
+
+ ds_put_format(s, "rte flow set-ipv4-%s action:\n", dirstr);
+ if (set_ipv4) {
+ ds_put_format(s,
+ " Set-ipv4-%s: "IP_FMT"\n", dirstr,
+ IP_ARGS(set_ipv4->ipv4_addr));
+ } else {
+ ds_put_format(s, " Set-ipv4-%s = null\n", dirstr);
+ }
+ } else if (actions->type == RTE_FLOW_ACTION_TYPE_SET_TTL) {
+ const struct rte_flow_action_set_ttl *set_ttl = actions->conf;
+
+ ds_put_cstr(s, "rte flow set-ttl action:\n");
+ if (set_ttl) {
+ ds_put_format(s, " Set-ttl: %d\n", set_ttl->ttl_value);
+ } else {
+ ds_put_cstr(s, " Set-ttl = null\n");
+ }
} else {
ds_put_format(s, "unknown rte flow action (%d)\n", actions->type);
}
@@ -847,6 +870,12 @@ BUILD_ASSERT_DECL(sizeof(struct rte_flow_action_set_mac) ==
MEMBER_SIZEOF(struct ovs_key_ethernet, eth_src));
BUILD_ASSERT_DECL(sizeof(struct rte_flow_action_set_mac) ==
MEMBER_SIZEOF(struct ovs_key_ethernet, eth_dst));
+BUILD_ASSERT_DECL(sizeof(struct rte_flow_action_set_ipv4) ==
+ MEMBER_SIZEOF(struct ovs_key_ipv4, ipv4_src));
+BUILD_ASSERT_DECL(sizeof(struct rte_flow_action_set_ipv4) ==
+ MEMBER_SIZEOF(struct ovs_key_ipv4, ipv4_dst));
+BUILD_ASSERT_DECL(sizeof(struct rte_flow_action_set_ttl) ==
+ MEMBER_SIZEOF(struct ovs_key_ipv4, ipv4_ttl));
static int
parse_set_actions(struct flow_actions *actions,
@@ -876,6 +905,18 @@ parse_set_actions(struct flow_actions *actions,
VLOG_DBG_RL(&rl, "Unsupported ETHERNET set action");
return -1;
}
+ } else if (nl_attr_type(sa) == OVS_KEY_ATTR_IPV4) {
+ const struct ovs_key_ipv4 *key = nl_attr_get(sa);
+ const struct ovs_key_ipv4 *mask = masked ? key + 1 : NULL;
+
+ add_set_flow_action(ipv4_src, RTE_FLOW_ACTION_TYPE_SET_IPV4_SRC);
+ add_set_flow_action(ipv4_dst, RTE_FLOW_ACTION_TYPE_SET_IPV4_DST);
+ add_set_flow_action(ipv4_ttl, RTE_FLOW_ACTION_TYPE_SET_TTL);
+
+ if (mask && !is_all_zeros(mask, sizeof *mask)) {
+ VLOG_DBG_RL(&rl, "Unsupported IPv4 set action");
+ return -1;
+ }
} else {
VLOG_DBG_RL(&rl,
"Unsupported set action type %d", nl_attr_type(sa));
--
2.14.5
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
