On 08.12.2019 14:22, Eli Britstein wrote:
> Support offload of output action, also configuring count action for
> allowing query statistics of HW offloaded flows.
>
> Signed-off-by: Eli Britstein <el...@mellanox.com>
> Reviewed-by: Oz Shlomo <o...@mellanox.com>
> ---
> Documentation/howto/dpdk.rst | 17 ++++++++---
> NEWS | 1 +
> lib/netdev-dpdk.c | 22 +++++++++++++
> lib/netdev-offload-dpdk.c | 73
> +++++++++++++++++++++++++++++++++++++++++---
> 4 files changed, 104 insertions(+), 9 deletions(-)
>
> diff --git a/Documentation/howto/dpdk.rst b/Documentation/howto/dpdk.rst
> index 766a7950c..f62ce82af 100644
> --- a/Documentation/howto/dpdk.rst
> +++ b/Documentation/howto/dpdk.rst
> @@ -370,19 +370,28 @@ The flow hardware offload is disabled by default and
> can be enabled by::
>
> $ ovs-vsctl set Open_vSwitch . other_config:hw-offload=true
>
> -So far only partial flow offload is implemented. Moreover, it only works
> -with PMD drivers have the rte_flow action "MARK + RSS" support.
> +Matches and actions are programmed into HW to achieve full offload of
> +the flow. If not all actions are supported, fallback to partial flow
> +offload (offloading matches only). Moreover, it only works with PMD
> +drivers that support the configured rte_flow actions.
> +Partial flow offload requires support of "MARK + RSS" actions. Full
> +hardware offload requires support of the actions listed below.
>
> The validated NICs are:
>
> - Mellanox (ConnectX-4, ConnectX-4 Lx, ConnectX-5)
> - Napatech (NT200B01)
>
> -Supported protocols for hardware offload are:
> +Supported protocols for hardware offload matches are:
> +
> - L2: Ethernet, VLAN
> -- L3: IPv4, IPv6
> +- L3: IPv4
> - L4: TCP, UDP, SCTP, ICMP
>
> +Supported actions for hardware offload are:
> +
> +- Output (a single output, as the last action).
Is there any particular restriction why we cant output to
several ports in a row?
> +
> Further Reading
> ---------------
>
> diff --git a/NEWS b/NEWS
> index 2acde3fe8..c430999a0 100644
> --- a/NEWS
> +++ b/NEWS
> @@ -26,6 +26,7 @@ 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 actions (experimental).
>
> v2.12.0 - 03 Sep 2019
> ---------------------
> diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c
> index 16baae0c4..d9a2c2004 100644
> --- a/lib/netdev-dpdk.c
> +++ b/lib/netdev-dpdk.c
> @@ -4699,6 +4699,28 @@ ds_put_flow_action(struct ds *s, const struct
> rte_flow_action *actions)
> } else {
> ds_put_cstr(s, " RSS = null\n");
> }
> + } else if (actions->type == RTE_FLOW_ACTION_TYPE_COUNT) {
> + const struct rte_flow_action_count *count = actions->conf;
> +
> + ds_put_cstr(s, "rte flow count action:\n");
> + if (count) {
> + ds_put_format(s,
> + " Count: shared=%d, id=%d\n",
> + count->shared, count->id);
> + } else {
> + ds_put_cstr(s, " Count = null\n");
> + }
> + } else if (actions->type == RTE_FLOW_ACTION_TYPE_PORT_ID) {
> + const struct rte_flow_action_port_id *port_id = actions->conf;
> +
> + ds_put_cstr(s, "rte flow port-id action:\n");
> + if (port_id) {
> + ds_put_format(s,
> + " Port-id: original=%d, id=%d\n",
> + port_id->original, port_id->id);
> + } else {
> + ds_put_cstr(s, " Port-id = null\n");
> + }
> } else {
> ds_put_format(s, "unknown rte flow action (%d)\n", actions->type);
> }
> diff --git a/lib/netdev-offload-dpdk.c b/lib/netdev-offload-dpdk.c
> index 10ab9240a..0b9087192 100644
> --- a/lib/netdev-offload-dpdk.c
> +++ b/lib/netdev-offload-dpdk.c
> @@ -456,20 +456,83 @@ netdev_offload_dpdk_mark_rss(struct flow_patterns
> *patterns,
> return flow;
> }
>
> +static void
> +add_count_action(struct flow_actions *actions)
> +{
> + struct rte_flow_action_count *count = xzalloc(sizeof *count);
> +
> + count->shared = 0;
> + /* Each flow has a single count action, so no need of id */
Comments style.
> + count->id = 0;
> + add_flow_action(actions, RTE_FLOW_ACTION_TYPE_COUNT, count);
> +}
> +
> static int
> -parse_flow_actions(struct netdev *netdev OVS_UNUSED,
> +add_port_id_action(struct flow_actions *actions,
> + struct netdev *outdev)
> +{
> + struct rte_flow_action_port_id *port_id = xzalloc(sizeof *port_id);
> + int outdev_id;
> +
> + outdev_id = netdev_dpdk_get_port_id(outdev);
> + if (outdev_id < 0) {
> + return -1;
> + }
> + port_id->id = outdev_id;
> + add_flow_action(actions, RTE_FLOW_ACTION_TYPE_PORT_ID, port_id);
> + return 0;
> +}
> +
> +static int
> +add_output_action(struct netdev *netdev,
> + struct flow_actions *actions,
> + const struct nlattr *nla,
> + struct offload_info *info)
> +{
> + struct netdev *outdev;
> + odp_port_t port;
> + int ret = 0;
> +
> + port = nl_attr_get_odp_port(nla);
> + outdev = netdev_ports_get(port, info->dpif_class);
> + if (outdev == NULL) {
> + VLOG_DBG_RL(&error_rl,
> + "Cannot find netdev for odp port %d", port);
> + return -1;
> + }
> + if (!netdev_flow_api_equals(netdev, outdev) ||
> + add_port_id_action(actions, outdev)) {
> + VLOG_DBG_RL(&error_rl,
> + "Output to %s cannot be offloaded",
> + netdev_get_name(outdev));
> + ret = -1;
> + }
> + netdev_close(outdev);
> + return ret;
> +}
> +
> +static int
> +parse_flow_actions(struct netdev *netdev,
> struct flow_actions *actions,
> struct nlattr *nl_actions,
> size_t nl_actions_len,
> - struct offload_info *info OVS_UNUSED)
> + struct offload_info *info)
> {
> struct nlattr *nla;
> size_t left;
>
> + add_count_action(actions);
> NL_ATTR_FOR_EACH_UNSAFE (nla, left, nl_actions, nl_actions_len) {
> - VLOG_DBG_RL(&error_rl,
> - "Unsupported action type %d", nl_attr_type(nla));
> - return -1;
> + if (nl_attr_type(nla) == OVS_ACTION_ATTR_OUTPUT) {
> + if (!(left <= NLA_ALIGN(nla->nla_len)) ||
> + add_output_action(netdev, actions, nla, info )) {
> + return -1;
> + }
> + } else {
> + VLOG_DBG_RL(&error_rl,
> + "Unsupported action type %d", nl_attr_type(nla));
> + return -1;
> + }
> }
>
> if (nl_actions_len == 0) {
>
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
