From patchwork Mon Dec 16 15:10:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eli Britstein X-Patchwork-Id: 1210480 X-Patchwork-Delegate: i.maximets@samsung.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=mellanox.com Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47c4Wr2RNtz9sR1 for ; Tue, 17 Dec 2019 02:12:40 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CE9898830D; Mon, 16 Dec 2019 15:12:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mfhfKxlkSEHa; Mon, 16 Dec 2019 15:12:36 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by hemlock.osuosl.org (Postfix) with ESMTP id 6B32B87EA2; Mon, 16 Dec 2019 15:12:26 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 549D9C1D87; Mon, 16 Dec 2019 15:12:26 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 1FF69C1D8C for ; Mon, 16 Dec 2019 15:12:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 105CA87631 for ; Mon, 16 Dec 2019 15:12:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JnLPP+jboCAc for ; Mon, 16 Dec 2019 15:12:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by whitealder.osuosl.org (Postfix) with ESMTP id 2F7B286E1F for ; Mon, 16 Dec 2019 15:12:12 +0000 (UTC) Received: from Internal Mail-Server by MTLPINE1 (envelope-from elibr@mellanox.com) with ESMTPS (AES256-SHA encrypted); 16 Dec 2019 17:12:09 +0200 Received: from dev-r-vrt-215.mtr.labs.mlnx. (dev-r-vrt-215.mtr.labs.mlnx [10.212.215.1]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id xBGFC78D006782; Mon, 16 Dec 2019 17:12:09 +0200 From: Eli Britstein To: dev@openvswitch.org, Ilya Maximets Date: Mon, 16 Dec 2019 15:10:46 +0000 Message-Id: <20191216151047.5967-17-elibr@mellanox.com> X-Mailer: git-send-email 2.14.5 In-Reply-To: <20191216151047.5967-1-elibr@mellanox.com> References: <20191216151047.5967-1-elibr@mellanox.com> Cc: Oz Shlomo , Majd Dibbiny , Eli Britstein , Ameer Mahagneh Subject: [ovs-dev] [PATCH V4 16/17] netdev-offload-dpdk: Support offload of set IPv4 actions X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Signed-off-by: Eli Britstein Reviewed-by: Oz Shlomo --- Documentation/howto/dpdk.rst | 1 + NEWS | 4 +-- lib/netdev-offload-dpdk.c | 69 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 72 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 3ade86d49..297ca6fff 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). v2.12.0 - 03 Sep 2019 --------------------- diff --git a/lib/netdev-offload-dpdk.c b/lib/netdev-offload-dpdk.c index 83fb7a2ed..0f0685f4d 100644 --- a/lib/netdev-offload-dpdk.c +++ b/lib/netdev-offload-dpdk.c @@ -382,6 +382,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); } @@ -888,6 +911,52 @@ parse_set_actions(struct flow_actions *actions, VLOG_DBG_RL(&error_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 ? + get_mask(sa, struct ovs_key_ipv4) : NULL; + struct ovs_key_ipv4 consumed_mask; + + if (masked) { + memcpy(&consumed_mask, mask, sizeof consumed_mask); + } else { + memset(&consumed_mask, 0, sizeof consumed_mask); + } + + BUILD_ASSERT(sizeof(struct rte_flow_action_set_ipv4) == + sizeof key->ipv4_src); + if (add_set_flow_action(actions, &key->ipv4_src, + mask ? &mask->ipv4_src : NULL, + sizeof key->ipv4_src, + RTE_FLOW_ACTION_TYPE_SET_IPV4_SRC)) { + return -1; + } + memset(&consumed_mask.ipv4_src, 0, sizeof consumed_mask.ipv4_src); + + BUILD_ASSERT(sizeof(struct rte_flow_action_set_ipv4) == + sizeof key->ipv4_dst); + if (add_set_flow_action(actions, &key->ipv4_dst, + mask ? &mask->ipv4_dst : NULL, + sizeof key->ipv4_dst, + RTE_FLOW_ACTION_TYPE_SET_IPV4_DST)) { + return -1; + } + memset(&consumed_mask.ipv4_dst, 0, sizeof consumed_mask.ipv4_dst); + + BUILD_ASSERT(sizeof(struct rte_flow_action_set_ttl) == + sizeof key->ipv4_ttl); + if (add_set_flow_action(actions, &key->ipv4_ttl, + mask ? &mask->ipv4_ttl : NULL, + sizeof key->ipv4_ttl, + RTE_FLOW_ACTION_TYPE_SET_TTL)) { + return -1; + } + memset(&consumed_mask.ipv4_ttl, 0, sizeof consumed_mask.ipv4_ttl); + + if (!is_all_zeros(&consumed_mask, sizeof consumed_mask)) { + VLOG_DBG_RL(&error_rl, "Unsupported IPv4 set action"); + return -1; + } } else { VLOG_DBG_RL(&error_rl, "Unsupported set action type=%d", nl_attr_type(sa));