Signed-off-by: Eli Britstein <el...@mellanox.com> Reviewed-by: Oz Shlomo <o...@mellanox.com> --- Documentation/howto/dpdk.rst | 1 + NEWS | 3 +- lib/netdev-offload-dpdk.c | 99 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+), 1 deletion(-)
diff --git a/Documentation/howto/dpdk.rst b/Documentation/howto/dpdk.rst index d9de7bedd..0e9939ddd 100644 --- a/Documentation/howto/dpdk.rst +++ b/Documentation/howto/dpdk.rst @@ -392,6 +392,7 @@ Supported actions for hardware offload are: - Output. - Drop. +- Modification of Ethernet (mod_dl_src/mod_dl_dst). Further Reading --------------- diff --git a/NEWS b/NEWS index d66656df8..acb27b99d 100644 --- a/NEWS +++ b/NEWS @@ -26,7 +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 and drop actions (experimental). + * Add hardware offload support for output, drop and set MAC actions + (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 295aa6b9d..4a090203e 100644 --- a/lib/netdev-offload-dpdk.c +++ b/lib/netdev-offload-dpdk.c @@ -369,6 +369,21 @@ dump_flow_action(struct ds *s, const struct rte_flow_action *actions) } } else if (actions->type == RTE_FLOW_ACTION_TYPE_DROP) { ds_put_cstr(s, "rte flow drop action\n"); + } else if (actions->type == RTE_FLOW_ACTION_TYPE_SET_MAC_SRC || + actions->type == RTE_FLOW_ACTION_TYPE_SET_MAC_DST) { + const struct rte_flow_action_set_mac *set_mac = actions->conf; + + char *dirstr = actions->type == RTE_FLOW_ACTION_TYPE_SET_MAC_DST + ? "dst" : "src"; + + ds_put_format(s, "rte flow set-mac-%s action:\n", dirstr); + if (set_mac) { + ds_put_format(s, + " Set-mac-%s: "ETH_ADDR_FMT"\n", dirstr, + ETH_ADDR_BYTES_ARGS(set_mac->mac_addr)); + } else { + ds_put_format(s, " Set-mac-%s = null\n", dirstr); + } } else { ds_put_format(s, "unknown rte flow action (%d)\n", actions->type); } @@ -791,6 +806,80 @@ add_output_action(struct netdev *netdev, return ret; } +static int +add_set_flow_action__(struct flow_actions *actions, + const void *value, void *mask, + const size_t size, const int attr) +{ + void *spec; + + if (mask) { + /* DPDK does not support partially masked set actions. In such + * case, fail the offload. + */ + if (is_all_zeros(mask, size)) { + return 0; + } + if (!is_all_ones(mask, size)) { + VLOG_DBG_RL(&rl, "Partial mask is not supported"); + return -1; + } + } + + spec = xzalloc(size); + memcpy(spec, value, size); + add_flow_action(actions, attr, spec); + + /* Clear used mask for later checking. */ + if (mask) { + memset(mask, 0, size); + } + return 0; +} + +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)); + +static int +parse_set_actions(struct flow_actions *actions, + const struct nlattr *set_actions, + const size_t set_actions_len, + bool masked) +{ + const struct nlattr *sa; + unsigned int sleft; + +#define add_set_flow_action(field, type) \ + if (add_set_flow_action__(actions, &key->field, \ + mask ? CONST_CAST(void *, &mask->field) : NULL, \ + sizeof key->field, type)) { \ + return -1; \ + } + + NL_ATTR_FOR_EACH_UNSAFE (sa, sleft, set_actions, set_actions_len) { + if (nl_attr_type(sa) == OVS_KEY_ATTR_ETHERNET) { + const struct ovs_key_ethernet *key = nl_attr_get(sa); + const struct ovs_key_ethernet *mask = masked ? key + 1 : NULL; + + add_set_flow_action(eth_src, RTE_FLOW_ACTION_TYPE_SET_MAC_SRC); + add_set_flow_action(eth_dst, RTE_FLOW_ACTION_TYPE_SET_MAC_DST); + + if (mask && !is_all_zeros(mask, sizeof *mask)) { + VLOG_DBG_RL(&rl, "Unsupported ETHERNET set action"); + return -1; + } + } else { + VLOG_DBG_RL(&rl, + "Unsupported set action type %d", nl_attr_type(sa)); + return -1; + } + } + + return 0; +} + static int parse_flow_actions(struct netdev *netdev, struct flow_actions *actions, @@ -807,6 +896,16 @@ parse_flow_actions(struct netdev *netdev, if (add_output_action(netdev, actions, nla, info)) { return -1; } + } else if (nl_attr_type(nla) == OVS_ACTION_ATTR_SET || + nl_attr_type(nla) == OVS_ACTION_ATTR_SET_MASKED) { + const struct nlattr *set_actions = nl_attr_get(nla); + const size_t set_actions_len = nl_attr_get_size(nla); + bool masked = nl_attr_type(nla) == OVS_ACTION_ATTR_SET_MASKED; + + if (parse_set_actions(actions, set_actions, set_actions_len, + masked)) { + return -1; + } } else { VLOG_DBG_RL(&rl, "Unsupported action type %d", nl_attr_type(nla)); return -1; -- 2.14.5 _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev